Changeset 196833 in webkit

Timestamp:

Feb 19, 2016, 1:49:34 PM (11 years ago)

Author:

Antti Koivisto

Message:

ComposedTreeIterator traverses normal children for elements with empty shadow root
​https://bugs.webkit.org/show_bug.cgi?id=154464

Reviewed by Ryosuke Niwa.

Source/WebCore:

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

• dom/ComposedTreeIterator.cpp:

(WebCore::ComposedTreeIterator::initializeContextStack):
(WebCore::ComposedTreeIterator::traverseShadowRoot):

If the shadow root is empty continue by skipping the real children.

(WebCore::ComposedTreeIterator::traverseNextInShadowTree):
(WebCore::composedTreeAsText):
(WebCore::ComposedTreeIterator::pushContext): Deleted.

• dom/ComposedTreeIterator.h:

(WebCore::ComposedTreeIterator::context):
(WebCore::ComposedTreeIterator::current):
(WebCore::ComposedTreeIterator::traverseNext):
(WebCore::composedTreeChildren):

• testing/Internals.cpp:

(WebCore::Internals::composedTreeAsText):

Testing support.

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/composed-tree-basic-expected.txt (added)
• LayoutTests/fast/shadow-dom/composed-tree-basic.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/ComposedTreeIterator.cpp (modified) (3 diffs)
• Source/WebCore/dom/ComposedTreeIterator.h (modified) (3 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-19  Antti Koivisto  <antti@apple.com>
+
+        ComposedTreeIterator traverses normal children for elements with empty shadow root
+        https://bugs.webkit.org/show_bug.cgi?id=154464
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/shadow-dom/composed-tree-basic-expected.txt: Added.
+        * fast/shadow-dom/composed-tree-basic.html: Added.
+
 2016-02-19  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-19  Antti Koivisto  <antti@apple.com>
+
+        ComposedTreeIterator traverses normal children for elements with empty shadow root
+        https://bugs.webkit.org/show_bug.cgi?id=154464
+
+        Reviewed by Ryosuke Niwa.
+
+        Test: fast/shadow-dom/composed-tree-basic.html
+
+        * dom/ComposedTreeIterator.cpp:
+        (WebCore::ComposedTreeIterator::initializeContextStack):
+        (WebCore::ComposedTreeIterator::traverseShadowRoot):
+
+            If the shadow root is empty continue by skipping the real children.
+
+        (WebCore::ComposedTreeIterator::traverseNextInShadowTree):
+        (WebCore::composedTreeAsText):
+        (WebCore::ComposedTreeIterator::pushContext): Deleted.
+        * dom/ComposedTreeIterator.h:
+        (WebCore::ComposedTreeIterator::context):
+        (WebCore::ComposedTreeIterator::current):
+        (WebCore::ComposedTreeIterator::traverseNext):
+        (WebCore::composedTreeChildren):
+        * testing/Internals.cpp:
+        (WebCore::Internals::composedTreeAsText):
+
+            Testing support.
+
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2016-02-19  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/dom/ComposedTreeIterator.cpp

@@ -28 +28 @@
 
 #include "HTMLSlotElement.h"
+#include "TextStream.h"
 
 namespace WebCore {
@@ -106 +107 @@
 }
 
-bool ComposedTreeIterator::pushContext(ShadowRoot& shadowRoot)
+void ComposedTreeIterator::traverseShadowRoot(ShadowRoot& shadowRoot)
 {
     Context shadowContext(shadowRoot);
-    if (!shadowContext.iterator)
-        return false;
+    if (!shadowContext.iterator) {
+        // Empty shadow root.
+        traverseNextSkippingChildren();
+        return;
+    }
+
     m_contextStack.append(WTFMove(shadowContext));
-    return true;
 }
 
@@ -181 +185 @@
 #endif
 
-}
+String composedTreeAsText(ContainerNode& root)
+{
+    TextStream stream;
+    auto descendants = composedTreeDescendants(root);
+    for (auto it = descendants.begin(), end = descendants.end(); it != end; ++it) {
+        writeIndent(stream, it.depth());
+
+        if (is<Text>(*it)) {
+            stream << "#text\n";
+            continue;
+        }
+        auto& element = downcast<Element>(*it);
+        stream << element.localName();
+        if (element.shadowRoot())
+            stream << " (shadow root)";
+        stream << "\n";
+    }
+    return stream.release();
+}
+
+}

trunk/Source/WebCore/dom/ComposedTreeIterator.h

@@ -59 +59 @@
     void traverseNextInShadowTree();
     void traverseNextLeavingContext();
-    bool pushContext(ShadowRoot&);
+    void traverseShadowRoot(ShadowRoot&);
 #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
     bool advanceInSlot(int direction);
@@ -93 +93 @@
 {
     if (auto* shadowRoot = context().iterator->shadowRoot()) {
-        if (pushContext(*shadowRoot))
-            return *this;
+        traverseShadowRoot(*shadowRoot);
+        return *this;
     }
 
@@ -201 +201 @@
 }
 
-}
-
-#endif
+WEBCORE_EXPORT String composedTreeAsText(ContainerNode& root);
+
+}
+
+#endif

trunk/Source/WebCore/testing/Internals.cpp

@@ -40 +40 @@
 #include "ClientRect.h"
 #include "ClientRectList.h"
+#include "ComposedTreeIterator.h"
 #include "Cursor.h"
 #include "DOMPath.h"
@@ -3488 +3489 @@
 }
 
-}
+String Internals::composedTreeAsText(Node* node)
+{
+    if (!is<ContainerNode>(node))
+        return "";
+    return WebCore::composedTreeAsText(downcast<ContainerNode>(*node));
+}
+
+}

trunk/Source/WebCore/testing/Internals.h

@@ -472 +472 @@
 #endif
 
+    String composedTreeAsText(Node*);
+
 private:
     explicit Internals(Document*);

trunk/Source/WebCore/testing/Internals.idl

@@ -440 +440 @@
 
     [RaisesException] void setCanShowModalDialogOverride(boolean allow);
-};
+
+    DOMString composedTreeAsText(Node parent);
+};