Changeset 92094 in webkit

Timestamp:

Jul 31, 2011 7:53:55 PM (13 years ago)

Author:

dominicc@chromium.org

Message:

Event target set to null post event dispatch
​https://bugs.webkit.org/show_bug.cgi?id=63934

Reviewed by Dimitri Glazkov.

Source/WebCore:

Test: fast/events/event-target-reset.html

• dom/EventDispatcher.cpp:

(WebCore::EventDispatcher::dispatchEvent): Reset target to outermost
shadow host.

LayoutTests:

• fast/events/event-target-reset-expected.txt: Added.
• fast/events/event-target-reset.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/event-target-reset-expected.txt (added)
• LayoutTests/fast/events/event-target-reset.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/EventDispatcher.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-31  Dominic Cooney  <dominicc@chromium.org>
+
+        Event target set to null post event dispatch
+        https://bugs.webkit.org/show_bug.cgi?id=63934
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/events/event-target-reset-expected.txt: Added.
+        * fast/events/event-target-reset.html: Added.
+
 2011-07-31  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-31  Dominic Cooney  <dominicc@chromium.org>
+
+        Event target set to null post event dispatch
+        https://bugs.webkit.org/show_bug.cgi?id=63934
+
+        Reviewed by Dimitri Glazkov.
+
+        Test: fast/events/event-target-reset.html
+
+        * dom/EventDispatcher.cpp:
+        (WebCore::EventDispatcher::dispatchEvent): Reset target to outermost
+        shadow host.
+
 2011-07-31  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/dom/EventDispatcher.cpp

@@ -365 +365 @@
     // Ensure that after event dispatch, the event's target object is the
     // outermost shadow DOM boundary.
-    event->setTarget(windowContext.target());
+    if (topEventContext())
+        event->setTarget(topEventContext()->target());
+    else {
+        ASSERT(!m_node->isInShadowTree());
+        event->setTarget(m_node.get());
+    }
     event->setCurrentTarget(0);
     InspectorInstrumentation::didDispatchEvent(cookie);