Changeset 123407 in webkit

Timestamp:

Jul 23, 2012 5:12:13 PM (12 years ago)

Author:

hayato@chromium.org

Message:

A FocusScope for a distributed node should not be its TreeScope.
​https://bugs.webkit.org/show_bug.cgi?id=91829

Reviewed by Dimitri Glazkov.

Source/WebCore:

Current implementation of FocusScope::focusScopeOf(Node*) returns
the given node's treeScope(). That does not apply if the node is
a distributed node. We should calculate a FocusScope for a
distributed node by traversing ancestor nodes in Composed Shadow
Tree.

Test: fast/dom/shadow/focus-navigation-with-distributed-nodes.html

• page/FocusController.cpp:

(WebCore::FocusScope::focusScopeOf):

LayoutTests:

• fast/dom/shadow/focus-navigation-with-distributed-nodes-expected.txt: Added.
• fast/dom/shadow/focus-navigation-with-distributed-nodes.html: Added.
• fast/dom/shadow/resources/shadow-dom.js:

(shouldNavigateFocus):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/focus-navigation-with-distributed-nodes-expected.txt (added)
• LayoutTests/fast/dom/shadow/focus-navigation-with-distributed-nodes.html (added)
• LayoutTests/fast/dom/shadow/resources/shadow-dom.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FocusController.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-23  Hayato Ito  <hayato@chromium.org>
+
+        A FocusScope for a distributed node should not be its TreeScope.
+        https://bugs.webkit.org/show_bug.cgi?id=91829
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/dom/shadow/focus-navigation-with-distributed-nodes-expected.txt: Added.
+        * fast/dom/shadow/focus-navigation-with-distributed-nodes.html: Added.
+        * fast/dom/shadow/resources/shadow-dom.js:
+        (shouldNavigateFocus):
+
 2012-07-23  Douglas Stockwell  <dstockwell@google.com>
 

trunk/LayoutTests/fast/dom/shadow/resources/shadow-dom.js

@@ -125 +125 @@
     }
     fromElement.focus();
+    if (!isInnermostActiveElement(from)) {
+        debug('FAIL: Can not be focused: '+ from);
+        return;
+    }
     if (direction == 'forward')
         navigateFocusForward();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-23  Hayato Ito  <hayato@chromium.org>
+
+        A FocusScope for a distributed node should not be its TreeScope.
+        https://bugs.webkit.org/show_bug.cgi?id=91829
+
+        Reviewed by Dimitri Glazkov.
+
+        Current implementation of FocusScope::focusScopeOf(Node*) returns
+        the given node's treeScope().  That does not apply if the node is
+        a distributed node.  We should calculate a FocusScope for a
+        distributed node by traversing ancestor nodes in Composed Shadow
+        Tree.
+
+        Test: fast/dom/shadow/focus-navigation-with-distributed-nodes.html
+
+        * page/FocusController.cpp:
+        (WebCore::FocusScope::focusScopeOf):
+
 2012-07-23  Douglas Stockwell  <dstockwell@google.com>
 

trunk/Source/WebCore/page/FocusController.cpp

@@ -120 +120 @@
 {
     ASSERT(node);
-    TreeScope* scope = node->treeScope();
-    if (scope->rootNode()->isShadowRoot())
-        return FocusScope(toShadowRoot(scope->rootNode())->owner()->youngestShadowRoot());
-    return FocusScope(scope);
+    ComposedShadowTreeWalker walker(node, ComposedShadowTreeWalker::DoNotCrossUpperBoundary);
+    Node* root = node;
+    while (walker.get()) {
+        root = walker.get();
+        walker.parent();
+    }
+    // The result is not always a ShadowRoot nor a DocumentNode since
+    // a starting node is in an orphaned tree in composed shadow tree.
+    return FocusScope(root->treeScope());
 }