Changeset 44913 in webkit

Timestamp:

Jun 21, 2009 1:47:18 PM (15 years ago)

Author:

weinig@apple.com

Message:

WebCore:

2009-06-21 Sam Weinig <​sam@webkit.org>

Reviewed by Eric Seidel

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=26578
event.currentTarget for listener registered on window should point to the window object like in Firefox

Test: fast/events/event-trace.html

• dom/Node.cpp: (WebCore::Node::dispatchGenericEvent): Make the DOMWindow the currentTarget when events are dispatched to it. We previously used the document because DOMWindow was not yet an EventTarget.

LayoutTests:

2009-06-21 Sam Weinig <​sam@webkit.org>

Reviewed by Eric Seidel.

Test for ​https://bugs.webkit.org/show_bug.cgi?id=26578
event.currentTarget for listener registered on window should point to the window object like in Firefox

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/event-trace-expected.txt (added)
• LayoutTests/fast/events/event-trace.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Node.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-06-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=26578
+        event.currentTarget for listener registered on window should point to the window object like in Firefox
+
+        * fast/events/event-trace-expected.txt: Added.
+        * fast/events/event-trace.html: Added.
+
 2009-06-21  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-06-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Eric Seidel
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=26578
+        event.currentTarget for listener registered on window should point to the window object like in Firefox
+
+        Test: fast/events/event-trace.html
+
+        * dom/Node.cpp:
+        (WebCore::Node::dispatchGenericEvent): Make the DOMWindow the currentTarget when events are dispatched
+        to it. We previously used the document because DOMWindow was not yet an EventTarget.
+
 2009-06-21  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/dom/Node.cpp

@@ -2493 +2493 @@
 
     if (targetForWindowEvents) {
-        event->setCurrentTarget(targetForWindowEvents->document()); // FIXME: targetForWindowEvents should be the event target.
+        event->setCurrentTarget(targetForWindowEvents);
         targetForWindowEvents->handleEvent(event.get(), true);
         if (event->propagationStopped())
@@ -2531 +2531 @@
         }
         if (targetForWindowEvents) {
-            event->setCurrentTarget(targetForWindowEvents->document()); // FIXME: targetForWindowEvents should be the event target.
+            event->setCurrentTarget(targetForWindowEvents);
             targetForWindowEvents->handleEvent(event.get(), false);
             if (event->propagationStopped() || event->cancelBubble())