Changeset 118111 in webkit

Timestamp:

May 22, 2012 8:36:39 PM (12 years ago)

Author:

hayato@chromium.org

Message:

Make ComposedShadowTreeWalker traverse inactive insertion points correctly.
​https://bugs.webkit.org/show_bug.cgi?id=86830

Reviewed by Dimitri Glazkov.

Source/WebCore:

Fixed InsertionPoint::isActive() issue, which may return true
wrongly even if the insertion point is not in Shadow DOM subtree.
Now ComposedShadowTreeWalker can traverse inactive insertion
points correctly using InsertionPoint::isActive().

Test: fast/dom/shadow/composed-shadow-tree-walker.html

• dom/ComposedShadowTreeWalker.cpp:

(WebCore::ComposedShadowTreeWalker::traverseNode):
(WebCore::ComposedShadowTreeWalker::escapeFallbackContentElement):
(WebCore::ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents):

• html/shadow/InsertionPoint.cpp:

(WebCore::InsertionPoint::isActive):

• html/shadow/InsertionPoint.h:

(WebCore::isActiveInsertionPoint):
(WebCore):

LayoutTests:

• fast/dom/shadow/composed-shadow-tree-walker-expected.txt:
• fast/dom/shadow/composed-shadow-tree-walker.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/composed-shadow-tree-walker-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/shadow/composed-shadow-tree-walker.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/ComposedShadowTreeWalker.cpp (modified) (3 diffs)
• Source/WebCore/html/shadow/InsertionPoint.cpp (modified) (1 diff)
• Source/WebCore/html/shadow/InsertionPoint.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-22  Hayato Ito  <hayato@chromium.org>
+
+        Make ComposedShadowTreeWalker traverse inactive insertion points correctly.
+        https://bugs.webkit.org/show_bug.cgi?id=86830
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/dom/shadow/composed-shadow-tree-walker-expected.txt:
+        * fast/dom/shadow/composed-shadow-tree-walker.html:
+
 2012-05-22  Stephanie Lewis  <slewis@apple.com>
 

trunk/LayoutTests/fast/dom/shadow/composed-shadow-tree-walker-expected.txt

@@ -151 +151 @@
 DIV      id=a
 
+Test for inactive insertion points.
+Composed Shadow Tree:
+DIV      id=a
+        CONTENT  id=b
+                CONTENT  id=c
+
+Traverse in forward.
+DIV      id=a
+CONTENT  id=b
+CONTENT  id=c
+Traverse in backward.
+CONTENT  id=c
+CONTENT  id=b
+DIV      id=a
+
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/dom/shadow/composed-shadow-tree-walker.html

@@ -157 +157 @@
               createDOM('div', {'id': 'f'})));
 
+debug('Test for inactive insertion points.');
+showComposedShadowTree(
+    createDOM('div', {'id': 'a'},
+              createDOM('content', {'id': 'b'},
+                        createDOM('content', {'id': 'c'}))));
+
 </script>
 <script src="../../js/resources/js-test-post.js"></script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-22  Hayato Ito  <hayato@chromium.org>
+
+        Make ComposedShadowTreeWalker traverse inactive insertion points correctly.
+        https://bugs.webkit.org/show_bug.cgi?id=86830
+
+        Reviewed by Dimitri Glazkov.
+
+        Fixed InsertionPoint::isActive() issue, which may return true
+        wrongly even if the insertion point is not in Shadow DOM subtree.
+        Now ComposedShadowTreeWalker can traverse inactive insertion
+        points correctly using InsertionPoint::isActive().
+
+        Test: fast/dom/shadow/composed-shadow-tree-walker.html
+
+        * dom/ComposedShadowTreeWalker.cpp:
+        (WebCore::ComposedShadowTreeWalker::traverseNode):
+        (WebCore::ComposedShadowTreeWalker::escapeFallbackContentElement):
+        (WebCore::ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents):
+        * html/shadow/InsertionPoint.cpp:
+        (WebCore::InsertionPoint::isActive):
+        * html/shadow/InsertionPoint.h:
+        (WebCore::isActiveInsertionPoint):
+        (WebCore):
+
 2012-05-22  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebCore/dom/ComposedShadowTreeWalker.cpp

@@ -113 +113 @@
 {
     ASSERT(node);
-    if (isInsertionPoint(node)) {
-        const InsertionPoint* insertionPoint = toInsertionPoint(node);
-        if (Node* next = (direction == TraversalDirectionForward ? insertionPoint->first() : insertionPoint->last()))
-            return traverseNode(next, direction);
-        return traverseLightChildren(node, direction);
-    }
-    return const_cast<Node*>(node);
+    if (!isInsertionPoint(node))
+        return const_cast<Node*>(node);
+    const InsertionPoint* insertionPoint = toInsertionPoint(node);
+    if (!insertionPoint->isActive())
+        return const_cast<Node*>(node);
+    if (Node* next = (direction == TraversalDirectionForward ? insertionPoint->first() : insertionPoint->last()))
+        return traverseNode(next, direction);
+    return traverseLightChildren(node, direction);
 }
 
@@ -177 +178 @@
 {
     ASSERT(node);
-    if (node->parentNode() && isInsertionPoint(node->parentNode()))
+    if (node->parentNode() && isActiveInsertionPoint(node->parentNode()))
         return traverseSiblingOrBackToInsertionPoint(node->parentNode(), direction);
     return 0;
@@ -185 +186 @@
 {
     ASSERT(node);
-    if (isInsertionPoint(node))
+    if (isActiveInsertionPoint(node))
         return traverseParent(node);
     return const_cast<Node*>(node);

trunk/Source/WebCore/html/shadow/InsertionPoint.cpp

@@ -102 +102 @@
 bool InsertionPoint::isActive() const
 {
+    if (!shadowRoot())
+        return false;
     const Node* node = parentNode();
     while (node) {

trunk/Source/WebCore/html/shadow/InsertionPoint.h

@@ -103 +103 @@
 }
 
+inline bool isActiveInsertionPoint(const Node* node)
+{
+    return isInsertionPoint(node) && toInsertionPoint(node)->isActive();
+}
+
 inline bool isShadowBoundary(Node* node)
 {