Changeset 73984 in webkit

Timestamp:

Dec 13, 2010 4:24:48 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Dimitri Glazkov.

Change SelectionController::setFocusedNodeIfNeeded to traverse the DOM
tree instead of the render tree.
​https://bugs.webkit.org/show_bug.cgi?id=50989

• editing/SelectionController.cpp: (WebCore::SelectionController::setFocusedNodeIfNeeded): Walk up DOM/hosted tree rather than render tree and remove FIXME comment that does't apply (SelectionController and EventHandler needs different checks).

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/SelectionController.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-13  Emil Eklund  <eae@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Change SelectionController::setFocusedNodeIfNeeded to traverse the DOM
+        tree instead of the render tree.
+        https://bugs.webkit.org/show_bug.cgi?id=50989
+
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::setFocusedNodeIfNeeded):
+        Walk up DOM/hosted tree rather than render tree and remove FIXME comment
+        that does't apply (SelectionController and EventHandler needs different
+        checks).
+
 2010-12-13  Chris Fleizach  <cfleizach@apple.com>
 

trunk/WebCore/editing/SelectionController.cpp

@@ -1552 +1552 @@
 
     if (Node* target = rootEditableElement()) {
-        RenderObject* renderer = target->renderer();
-
-        // 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: Combine with the same traversal code in EventHandle::dispatchMouseEvent.
-        while (renderer) {
+        // Walk up the DOM tree to search for a node to focus. 
+        while (target) {
             // We don't want to set focus on a subframe when selecting in a parent frame,
             // so add the !isFrameElement check here. There's probably a better way to make this
@@ -1565 +1561 @@
                 return;
             }
-            renderer = renderer->parent();
-            if (renderer)
-                target = renderer->node();
+            target = target->parentOrHostNode(); 
         }
         m_frame->document()->setFocusedNode(0);