<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[197077] releases/WebKitGTK/webkit-2.12</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197077">197077</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-25 02:00:13 -0800 (Thu, 25 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/196833">r196833</a> - 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoredomComposedTreeIteratorcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoredomComposedTreeIteratorh">releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoretestingInternalscpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoretestingInternalsh">releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoretestingInternalsidl">releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastshadowdomcomposedtreebasicexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-basic-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastshadowdomcomposedtreebasichtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-basic.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (197076 => 197077)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-02-18 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> JSObject::getPropertySlot - index-as-propertyname, override on prototype, & shadow
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastshadowdomcomposedtreebasicexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-basic-expected.txt (0 => 197077)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+
+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
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastshadowdomcomposedtreebasichtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-basic.html (0 => 197077)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+<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>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (197076 => 197077)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-02-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Use more concrete types for parsing positions
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoredomComposedTreeIteratorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.cpp (197076 => 197077)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "ComposedTreeIterator.h"
</span><span class="cx">
</span><span class="cx"> #include "HTMLSlotElement.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -105,13 +106,16 @@
</span><span class="cx"> m_contextStack.reverse();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ComposedTreeIterator::pushContext(ShadowRoot& shadowRoot)
</del><ins>+void ComposedTreeIterator::traverseShadowRoot(ShadowRoot& shadowRoot)
</ins><span class="cx"> {
</span><span class="cx"> Context shadowContext(shadowRoot);
</span><del>- if (!shadowContext.iterator)
- return false;
</del><ins>+ if (!shadowContext.iterator) {
+ // Empty shadow root.
+ traverseNextSkippingChildren();
+ return;
+ }
+
</ins><span class="cx"> m_contextStack.append(WTFMove(shadowContext));
</span><del>- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ComposedTreeIterator::traverseNextInShadowTree()
</span><span class="lines">@@ -180,4 +184,24 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+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();
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoredomComposedTreeIteratorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.h (197076 => 197077)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> void initializeContextStack(ContainerNode& root, Node& current);
</span><span class="cx"> void traverseNextInShadowTree();
</span><span class="cx"> void traverseNextLeavingContext();
</span><del>- bool pushContext(ShadowRoot&);
</del><ins>+ void traverseShadowRoot(ShadowRoot&);
</ins><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</span><span class="cx"> bool advanceInSlot(int direction);
</span><span class="cx"> void traverseSiblingInSlot(int direction);
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx"> inline ComposedTreeIterator& ComposedTreeIterator::traverseNext()
</span><span class="cx"> {
</span><span class="cx"> if (auto* shadowRoot = context().iterator->shadowRoot()) {
</span><del>- if (pushContext(*shadowRoot))
- return *this;
</del><ins>+ traverseShadowRoot(*shadowRoot);
+ return *this;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_contextStack.size() > 1) {
</span><span class="lines">@@ -200,6 +200,8 @@
</span><span class="cx"> return ComposedTreeChildAdapter(parent);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT String composedTreeAsText(ContainerNode& root);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.cpp (197076 => 197077)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "ClientRect.h"
</span><span class="cx"> #include "ClientRectList.h"
</span><ins>+#include "ComposedTreeIterator.h"
</ins><span class="cx"> #include "Cursor.h"
</span><span class="cx"> #include "DOMPath.h"
</span><span class="cx"> #include "DOMStringList.h"
</span><span class="lines">@@ -3487,4 +3488,11 @@
</span><span class="cx"> Settings::setResourceLoadStatisticsEnabled(enable);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String Internals::composedTreeAsText(Node* node)
+{
+ if (!is<ContainerNode>(node))
+ return "";
+ return WebCore::composedTreeAsText(downcast<ContainerNode>(*node));
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.h (197076 => 197077)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -471,6 +471,8 @@
</span><span class="cx"> bool isReadableStreamDisturbed(ScriptState&, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ String composedTreeAsText(Node*);
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit Internals(Document*);
</span><span class="cx"> Document* contextDocument() const;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/testing/Internals.idl (197076 => 197077)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -439,4 +439,6 @@
</span><span class="cx"> void setResourceLoadStatisticsEnabled(boolean enable);
</span><span class="cx">
</span><span class="cx"> [RaisesException] void setCanShowModalDialogOverride(boolean allow);
</span><ins>+
+ DOMString composedTreeAsText(Node parent);
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>