Changeset 148072 in webkit

Timestamp:

Apr 9, 2013 6:11:50 PM (11 years ago)

Author:

adamk@chromium.org

Message:

Update Document's event listener type bitfield when adopting a Node
​https://bugs.webkit.org/show_bug.cgi?id=114322

Reviewed by Darin Adler.

Source/WebCore:

Without this, moving a Node between documents can silently deactivate
an event listener, if it's one of the types that whose creation is
optimized away by Document::hasListenerType.

An alternate approach would be to simply copy the old document's
bitfield over. It's a tradeoff between making adoption fast and making
the operation of any operation depending on these event types fast.
The latter seems like the right optimization given that adoption
doesn't happen very often.

Test: fast/events/event-listener-moving-documents.html

• dom/Node.cpp:

(WebCore::Node::didMoveToNewDocument): For each event listener type on the adopted node, update the new document's list of listener types.

LayoutTests:

• fast/events/event-listener-moving-documents-expected.txt: Added.
• fast/events/event-listener-moving-documents.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/event-listener-moving-documents-expected.txt (added)
• LayoutTests/fast/events/event-listener-moving-documents.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Node.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-09  Adam Klein  <adamk@chromium.org>
+
+        Update Document's event listener type bitfield when adopting a Node
+        https://bugs.webkit.org/show_bug.cgi?id=114322
+
+        Reviewed by Darin Adler.
+
+        * fast/events/event-listener-moving-documents-expected.txt: Added.
+        * fast/events/event-listener-moving-documents.html: Added.
+
 2013-04-09  Dongwoo Joshua Im  <dw.im@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-09  Adam Klein  <adamk@chromium.org>
+
+        Update Document's event listener type bitfield when adopting a Node
+        https://bugs.webkit.org/show_bug.cgi?id=114322
+
+        Reviewed by Darin Adler.
+
+        Without this, moving a Node between documents can silently deactivate
+        an event listener, if it's one of the types that whose creation is
+        optimized away by Document::hasListenerType.
+
+        An alternate approach would be to simply copy the old document's
+        bitfield over. It's a tradeoff between making adoption fast and making
+        the operation of any operation depending on these event types fast.
+        The latter seems like the right optimization given that adoption
+        doesn't happen very often.
+
+        Test: fast/events/event-listener-moving-documents.html
+
+        * dom/Node.cpp:
+        (WebCore::Node::didMoveToNewDocument): For each event listener type on the adopted node, update the new document's list of listener types.
+
 2013-04-09  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/dom/Node.cpp

@@ -2153 +2153 @@
     TreeScopeAdopter::ensureDidMoveToNewDocumentWasCalled(oldDocument);
 
+    if (const EventTargetData* eventTargetData = this->eventTargetData()) {
+        const EventListenerMap& listenerMap = eventTargetData->eventListenerMap;
+        if (!listenerMap.isEmpty()) {
+            Vector<AtomicString> types = listenerMap.eventTypes();
+            for (unsigned i = 0; i < types.size(); ++i)
+                document()->addListenerTypeIfNeeded(types[i]);
+        }
+    }
+
     if (AXObjectCache::accessibilityEnabled() && oldDocument)
         if (AXObjectCache* cache = oldDocument->existingAXObjectCache())
             cache->remove(this);
-
-    // FIXME: Event listener types for this node should be set on the new owner document here.
 
     const EventListenerVector& wheelListeners = getEventListeners(eventNames().mousewheelEvent);