Changeset 73717 in webkit

Timestamp:

Dec 10, 2010 4:14:54 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-10 Emil Eklund <​eae@chromium.org>

Reviewed by Eric Seidel.

Change EventHandler::dispatchMouseEvent code to use DOM traversal instead of render tree traversal
​https://bugs.webkit.org/show_bug.cgi?id=49982

• page/EventHandler.cpp: (WebCore::EventHandler::dispatchMouseEvent): Walk up DOM/hosted tree rather than render tree.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-10  Emil Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Change EventHandler::dispatchMouseEvent code to use DOM traversal instead of render tree traversal
+        https://bugs.webkit.org/show_bug.cgi?id=49982
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::dispatchMouseEvent):
+        Walk up DOM/hosted tree rather than render tree.
+
 2010-12-10  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/WebCore/page/EventHandler.cpp

@@ -1856 +1856 @@
         // from form fields before the button click is processed.
         Node* node = m_nodeUnderMouse.get();
-        RenderObject* renderer = node ? node->renderer() : 0;
-
-        // Walk up the render tree to search for a node to focus.
-        // Walking up the DOM tree wouldn't work for shadow trees, like those behind the engine-based text fields.
-        // FIXME: Rework to use shadowParent. No need to traverse with the render tree.
-        while (renderer) {
-            node = renderer->node();
-            if (node && node->isMouseFocusable()) {
-                // To fix <rdar://problem/4895428> Can't drag selected ToDo, we don't focus a 
-                // node on mouse down if it's selected and inside a focused node. It will be 
+
+        // Walk up the DOM tree to search for a node to focus.
+        while (node) {
+            if (node->isMouseFocusable()) {
+                // To fix <rdar://problem/4895428> Can't drag selected ToDo, we don't focus a
+                // node on mouse down if it's selected and inside a focused node. It will be
                 // focused if the user does a mouseup over it, however, because the mouseup
                 // will set a selection inside it, which will call setFocuseNodeIfNeeded.
@@ -1877 +1873 @@
                 break;
             }
-            
-            renderer = renderer->parent();
+            node = node->parentOrHostNode();
         }