Changeset 206534 in webkit

Timestamp:

Sep 28, 2016 12:37:14 PM (8 years ago)

Author:

rniwa@webkit.org

Message:

assignedNodes should include fallback contents when flattened option is set
​https://bugs.webkit.org/show_bug.cgi?id=162656

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Rebaselined the tests now that all the test cases are passing.

• web-platform-tests/shadow-dom/slots-expected.txt:
• web-platform-tests/shadow-dom/slots-fallback-expected.txt:

Source/WebCore:

Fixed the bug by traversing through fallback contents when there are no assigned nodes.

Tests: imported/w3c/web-platform-tests/shadow-dom/slots.html

imported/w3c/web-platform-tests/shadow-dom/slots-fallback.html

• html/HTMLSlotElement.cpp:

(WebCore::flattenAssignedNodes):
(WebCore::HTMLSlotElement::assignedNodes):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/shadow-dom/slots-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/shadow-dom/slots-fallback-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLSlotElement.cpp (modified) (4 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2016-09-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        assignedNodes should include fallback contents when flattened option is set
+        https://bugs.webkit.org/show_bug.cgi?id=162656
+
+        Reviewed by Antti Koivisto.
+
+        Rebaselined the tests now that all the test cases are passing.
+
+        * web-platform-tests/shadow-dom/slots-expected.txt:
+        * web-platform-tests/shadow-dom/slots-fallback-expected.txt:
+
 2016-09-27  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/shadow-dom/slots-expected.txt

@@ -3 +3 @@
 PASS Slots: Slots in closed. 
 PASS Slots: Slots not in a shadow tree. 
-FAIL Slots: Distributed nooes for Slots not in a shadow tree. assert_array_equals: lengths differ, expected 1 got 0
+PASS Slots: Distributed nooes for Slots not in a shadow tree. 
 PASS Slots: Name matching 
 PASS Slots: No direct host child. 

trunk/LayoutTests/imported/w3c/web-platform-tests/shadow-dom/slots-fallback-expected.txt

@@ -1 +1 @@
 
-FAIL Slots fallback: Basic. assert_array_equals: lengths differ, expected 1 got 0
-FAIL Slots fallback: Slots in Slots. assert_array_equals: lengths differ, expected 1 got 0
-FAIL Slots fallback: Fallback contents should not be used if a node is assigned. assert_array_equals: lengths differ, expected 1 got 0
-FAIL Slots fallback: Slots in Slots: Assinged nodes should be used as fallback contents of another slot assert_array_equals: lengths differ, expected 1 got 0
-FAIL Slots fallback: Complex case. assert_array_equals: lengths differ, expected 2 got 0
-FAIL Slots fallback: Mutation. Append fallback contents. assert_array_equals: lengths differ, expected 3 got 0
-FAIL Slots fallback: Mutation. Remove fallback contents. assert_array_equals: lengths differ, expected 1 got 0
-FAIL Slots fallback: Mutation. Assign a node to a slot so that fallback contens are no longer used. assert_array_equals: lengths differ, expected 2 got 0
-FAIL Slots fallback: Mutation. Remove an assigned node from a slot so that fallback contens will be used. assert_array_equals: lengths differ, expected 1 got 0
-FAIL Slots fallback: Mutation.  Remove a slot which is a fallback content of another slot. assert_array_equals: lengths differ, expected 1 got 0
+PASS Slots fallback: Basic. 
+PASS Slots fallback: Slots in Slots. 
+PASS Slots fallback: Fallback contents should not be used if a node is assigned. 
+PASS Slots fallback: Slots in Slots: Assinged nodes should be used as fallback contents of another slot 
+PASS Slots fallback: Complex case. 
+PASS Slots fallback: Mutation. Append fallback contents. 
+PASS Slots fallback: Mutation. Remove fallback contents. 
+PASS Slots fallback: Mutation. Assign a node to a slot so that fallback contens are no longer used. 
+PASS Slots fallback: Mutation. Remove an assigned node from a slot so that fallback contens will be used. 
+PASS Slots fallback: Mutation.  Remove a slot which is a fallback content of another slot. 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        assignedNodes should include fallback contents when flattened option is set
+        https://bugs.webkit.org/show_bug.cgi?id=162656
+
+        Reviewed by Antti Koivisto.
+
+        Fixed the bug by traversing through fallback contents when there are no assigned nodes.
+
+        Tests: imported/w3c/web-platform-tests/shadow-dom/slots.html
+               imported/w3c/web-platform-tests/shadow-dom/slots-fallback.html
+
+        * html/HTMLSlotElement.cpp:
+        (WebCore::flattenAssignedNodes):
+        (WebCore::HTMLSlotElement::assignedNodes):
+
 2016-09-27  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/html/HTMLSlotElement.cpp

@@ -27 +27 @@
 #include "HTMLSlotElement.h"
 
-
 #include "Event.h"
 #include "EventNames.h"
@@ -33 +32 @@
 #include "MutationObserver.h"
 #include "ShadowRoot.h"
+#include "Text.h"
 
 namespace WebCore {
@@ -99 +99 @@
 }
 
-static void flattenAssignedNodes(Vector<Node*>& nodes, const Vector<Node*>& assignedNodes)
+static void flattenAssignedNodes(Vector<Node*>& nodes, const HTMLSlotElement& slot)
 {
-    for (Node* node : assignedNodes) {
-        if (is<HTMLSlotElement>(*node)) {
-            if (auto* innerAssignedNodes = downcast<HTMLSlotElement>(*node).assignedNodes())
-                flattenAssignedNodes(nodes, *innerAssignedNodes);
-            continue;
+    auto* assignedNodes = slot.assignedNodes();
+    if (!assignedNodes) {
+        for (Node* child = slot.firstChild(); child; child = child->nextSibling()) {
+            if (is<HTMLSlotElement>(*child))
+                flattenAssignedNodes(nodes, downcast<HTMLSlotElement>(*child));
+            else if (is<Text>(*child) || is<Element>(*child))
+                nodes.append(child);
         }
-        nodes.append(node);
+        return;
+    }
+    for (Node* node : *assignedNodes) {
+        if (is<HTMLSlotElement>(*node))
+            flattenAssignedNodes(nodes, downcast<HTMLSlotElement>(*node));
+        else
+            nodes.append(node);
     }
 }
@@ -113 +121 @@
 Vector<Node*> HTMLSlotElement::assignedNodes(const AssignedNodesOptions& options) const
 {
+    if (options.flatten) {
+        Vector<Node*> nodes;
+        flattenAssignedNodes(nodes, *this);
+        return nodes;
+    }
     auto* assignedNodes = this->assignedNodes();
     if (!assignedNodes)
         return { };
-
-    if (!options.flatten)
-        return *assignedNodes;
-
-    Vector<Node*> nodes;
-    flattenAssignedNodes(nodes, *assignedNodes);
-    return nodes;
+    return *assignedNodes;
 }