Merge webkit.org at R49305 : Update CacheBuilder to use new event listener methods.

See http://trac.webkit.org/changeset/48701

Change-Id: I627b40265f2aff72fdd4ad5884596be9820b642d

1 files changed, 3 insertions, 8 deletions

diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index c28ff60..0dc34c7 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -757,14 +757,9 @@ void CacheBuilder::adjustForColumns(const ClipColumnTracker& track,
 
 // Checks if a node has one of event listener types.
 bool CacheBuilder::NodeHasEventListeners(Node* node, AtomicString* eventTypes, int length) {
-    const RegisteredEventListenerVector& listeners = node->eventListeners();
-    size_t size = listeners.size();
-    for (size_t i = 0; i < size; ++i) {
-        const RegisteredEventListener& r = *listeners[i];
-        for (int j = 0; j < length; ++j) {
-            if (r.eventType() == eventTypes[j])
-                return true;
-        }
+    for (int i = 0; i < length; ++i) {
+        if (!node->getEventListeners(eventTypes[i]).isEmpty())
+            return true;
     }
     return false;
 }