Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (197076 => 197077)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-02-25 09:48:09 UTC (rev 197076)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-02-25 10:00:13 UTC (rev 197077)
@@ -1,3 +1,13 @@
+2016-02-19 Antti Koivisto <[email protected]>
+
+ 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-18 Gavin Barraclough <[email protected]>
JSObject::getPropertySlot - index-as-propertyname, override on prototype, & shadow
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-basic-expected.txt (0 => 197077)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-basic-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-basic-expected.txt 2016-02-25 10:00:13 UTC (rev 197077)
@@ -0,0 +1,71 @@
+
+Test 1
+
+Test 2
+ #text
+
+Test 3
+ div
+
+Test 4
+ div
+ #text
+ div
+ #text
+
+Test 5
+ div (shadow root)
+ #text
+
+Test 6
+ div (shadow root)
+ #text
+
+Test 7
+ div (shadow root)
+ #text
+ div
+ div
+ #text
+ div
+ #text
+
+Test 8
+ div (shadow root)
+ #text
+ div
+ div
+ #text
+ div
+ #text
+
+Test 9
+ div (shadow root)
+ div
+ #text
+ div (shadow root)
+ #text
+ div
+ div
+ #text
+ div (shadow root)
+ #text
+ div
+ div
+ #text
+
+Test 10
+ div (shadow root)
+ div
+ #text
+ div (shadow root)
+ #text
+ div
+ div
+ #text
+ div (shadow root)
+ #text
+ div
+ div
+ #text
+
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-basic.html (0 => 197077)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-basic.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-basic.html 2016-02-25 10:00:13 UTC (rev 197077)
@@ -0,0 +1,58 @@
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+
+<template id=shadow1></template>
+<template id=shadow2>text<div><div></div></div>text</template>
+<template id=shadow3><div>text<div shadow=shadow2></div></div><div shadow=shadow2></div></template>
+
+<template test=1></template>
+
+<template test=2>text</template>
+
+<template test=3><div></div></template>
+
+<template test=4><div>text<div>text</div></div></template>
+
+<template test=5><div shadow=shadow1></div>text</template>
+
+<template test=6><div shadow=shadow1>text<div></div></div>text</template>
+
+<template test=7><div shadow=shadow2></div><div>text</div></template>
+
+<template test=8><div shadow=shadow2>text<div></div></div><div>text</div></template>
+
+<template test=9><div shadow=shadow3></div></template>
+
+<template test=10><div shadow=shadow3>text<div></div></div></template>
+
+<body>
+<pre id=console></pre>
+<script>
+function installShadows(tree)
+{
+ var shadowHosts = tree.querySelectorAll("[shadow]");
+ for (var i = 0; i < shadowHosts.length; ++i) {
+ var shadowId = shadowHosts[i].getAttribute("shadow");
+ var shadowContents = document.querySelector("#"+shadowId).content.cloneNode(true);
+
+ installShadows(shadowContents);
+
+ var shadowRoot = shadowHosts[i].attachShadow({ mode: "open" });
+ shadowRoot.appendChild(shadowContents);
+ }
+}
+
+var console = document.querySelector("#console");
+
+var tests = document.querySelectorAll("[test]");
+for (var i = 0; i < tests.length; ++i) {
+ var test = tests[i].content.cloneNode(true);
+ installShadows(test);
+ console.innerText += "\nTest " + tests[i].getAttribute("test") + "\n";
+ console.innerText += internals.composedTreeAsText(test);
+}
+
+</script>
+</body>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (197076 => 197077)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-02-25 09:48:09 UTC (rev 197076)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-02-25 10:00:13 UTC (rev 197077)
@@ -1,3 +1,34 @@
+2016-02-19 Antti Koivisto <[email protected]>
+
+ 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 Simon Fraser <[email protected]>
Use more concrete types for parsing positions
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.cpp (197076 => 197077)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.cpp 2016-02-25 09:48:09 UTC (rev 197076)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.cpp 2016-02-25 10:00:13 UTC (rev 197077)
@@ -27,6 +27,7 @@
#include "ComposedTreeIterator.h"
#include "HTMLSlotElement.h"
+#include "TextStream.h"
namespace WebCore {
@@ -105,13 +106,16 @@
m_contextStack.reverse();
}
-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;
}
void ComposedTreeIterator::traverseNextInShadowTree()
@@ -180,4 +184,24 @@
}
#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();
}
+
+}
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.h (197076 => 197077)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.h 2016-02-25 09:48:09 UTC (rev 197076)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.h 2016-02-25 10:00:13 UTC (rev 197077)
@@ -58,7 +58,7 @@
void initializeContextStack(ContainerNode& root, Node& current);
void traverseNextInShadowTree();
void traverseNextLeavingContext();
- bool pushContext(ShadowRoot&);
+ void traverseShadowRoot(ShadowRoot&);
#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
bool advanceInSlot(int direction);
void traverseSiblingInSlot(int direction);
@@ -92,8 +92,8 @@
inline ComposedTreeIterator& ComposedTreeIterator::traverseNext()
{
if (auto* shadowRoot = context().iterator->shadowRoot()) {
- if (pushContext(*shadowRoot))
- return *this;
+ traverseShadowRoot(*shadowRoot);
+ return *this;
}
if (m_contextStack.size() > 1) {
@@ -200,6 +200,8 @@
return ComposedTreeChildAdapter(parent);
}
+WEBCORE_EXPORT String composedTreeAsText(ContainerNode& root);
+
}
#endif
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.cpp (197076 => 197077)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.cpp 2016-02-25 09:48:09 UTC (rev 197076)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.cpp 2016-02-25 10:00:13 UTC (rev 197077)
@@ -39,6 +39,7 @@
#include "ChromeClient.h"
#include "ClientRect.h"
#include "ClientRectList.h"
+#include "ComposedTreeIterator.h"
#include "Cursor.h"
#include "DOMPath.h"
#include "DOMStringList.h"
@@ -3487,4 +3488,11 @@
Settings::setResourceLoadStatisticsEnabled(enable);
}
+String Internals::composedTreeAsText(Node* node)
+{
+ if (!is<ContainerNode>(node))
+ return "";
+ return WebCore::composedTreeAsText(downcast<ContainerNode>(*node));
}
+
+}
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.h (197076 => 197077)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.h 2016-02-25 09:48:09 UTC (rev 197076)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.h 2016-02-25 10:00:13 UTC (rev 197077)
@@ -471,6 +471,8 @@
bool isReadableStreamDisturbed(ScriptState&, JSC::JSValue);
#endif
+ String composedTreeAsText(Node*);
+
private:
explicit Internals(Document*);
Document* contextDocument() const;
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.idl (197076 => 197077)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.idl 2016-02-25 09:48:09 UTC (rev 197076)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.idl 2016-02-25 10:00:13 UTC (rev 197077)
@@ -439,4 +439,6 @@
void setResourceLoadStatisticsEnabled(boolean enable);
[RaisesException] void setCanShowModalDialogOverride(boolean allow);
+
+ DOMString composedTreeAsText(Node parent);
};
