<!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>[199362] 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/199362">199362</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-12 09:30:50 -0700 (Tue, 12 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/198087">r198087</a> - ComposedTreeIterator fails to traverse slots if root is shadow host
https://bugs.webkit.org/show_bug.cgi?id=155407
Reviewed by Darin Adler.
Source/WebCore:
Test: fast/shadow-dom/composed-tree-shadow-subtree.html
* dom/ComposedTreeIterator.cpp:
(WebCore::ComposedTreeIterator::ComposedTreeIterator):
Traversal functions assume m_contextStack is deeper than 1 before they need to enter slot traversal code paths.
Call initializeContextStack in case of shadow host which does the right thing.
(WebCore::ComposedTreeIterator::traverseSiblingInSlot):
(WebCore::composedTreeAsText):
Add option to include pointers as debugging aid.
* dom/ComposedTreeIterator.h:
(WebCore::composedTreeChildren):
LayoutTests:
* fast/shadow-dom/composed-tree-shadow-subtree-expected.txt: Added.
* fast/shadow-dom/composed-tree-shadow-subtree.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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastshadowdomcomposedtreeshadowsubtreeexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-shadow-subtree-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastshadowdomcomposedtreeshadowsubtreehtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-shadow-subtree.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 (199361 => 199362)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-12 16:27:45 UTC (rev 199361)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-12 16:30:50 UTC (rev 199362)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-03-13 Antti Koivisto <antti@apple.com>
+
+ ComposedTreeIterator fails to traverse slots if root is shadow host
+ https://bugs.webkit.org/show_bug.cgi?id=155407
+
+ Reviewed by Darin Adler.
+
+ * fast/shadow-dom/composed-tree-shadow-subtree-expected.txt: Added.
+ * fast/shadow-dom/composed-tree-shadow-subtree.html: Added.
+
</ins><span class="cx"> 2016-03-12 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r188647): Teamtreehouse website sidebar buttons are not rendered
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastshadowdomcomposedtreeshadowsubtreeexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-shadow-subtree-expected.txt (0 => 199362)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-shadow-subtree-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-shadow-subtree-expected.txt 2016-04-12 16:30:50 UTC (rev 199362)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+
+Test 1
+ div (shadow root)
+
+Shadow host subtree
+
+Test 2
+ div (shadow root)
+
+Shadow host subtree
+
+Test 3
+ div (shadow root)
+ slot
+ div
+
+Shadow host subtree
+ slot
+ div
+
+Slot subtree
+ div
+
+Test 4
+ div (shadow root)
+ slot
+ #text
+
+Shadow host subtree
+ slot
+ #text
+
+Slot subtree
+ #text
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastshadowdomcomposedtreeshadowsubtreehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-shadow-subtree.html (0 => 199362)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-shadow-subtree.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/composed-tree-shadow-subtree.html 2016-04-12 16:30:50 UTC (rev 199362)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+<html>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+
+<template id=shadow1></template>
+<template id=shadow2><slot><div></div></slot></template>
+
+<template test=1><div shadow=shadow1></div></template>
+<template test=2><div shadow=shadow1>text</div></template>
+<template test=3><div shadow=shadow2></div></template>
+<template test=4><div shadow=shadow2>text</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);
+
+ console.innerText += "\nShadow host subtree\n"
+ var shadowSubtree = test.querySelector("[shadow]");
+ console.innerText += internals.composedTreeAsText(shadowSubtree);
+
+ var slotSubtree = shadowSubtree.shadowRoot.querySelector("slot");
+ if (slotSubtree) {
+ console.innerText += "\nSlot subtree\n"
+ console.innerText += internals.composedTreeAsText(slotSubtree);
+ }
+}
+
+</script>
+</body>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199361 => 199362)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-12 16:27:45 UTC (rev 199361)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-12 16:30:50 UTC (rev 199362)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-03-13 Antti Koivisto <antti@apple.com>
+
+ ComposedTreeIterator fails to traverse slots if root is shadow host
+ https://bugs.webkit.org/show_bug.cgi?id=155407
+
+ Reviewed by Darin Adler.
+
+ Test: fast/shadow-dom/composed-tree-shadow-subtree.html
+
+ * dom/ComposedTreeIterator.cpp:
+ (WebCore::ComposedTreeIterator::ComposedTreeIterator):
+
+ Traversal functions assume m_contextStack is deeper than 1 before they need to enter slot traversal code paths.
+ Call initializeContextStack in case of shadow host which does the right thing.
+
+ (WebCore::ComposedTreeIterator::traverseSiblingInSlot):
+ (WebCore::composedTreeAsText):
+
+ Add option to include pointers as debugging aid.
+
+ * dom/ComposedTreeIterator.h:
+ (WebCore::composedTreeChildren):
+
</ins><span class="cx"> 2016-03-12 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r188647): Teamtreehouse website sidebar buttons are not rendered
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoredomComposedTreeIteratorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.cpp (199361 => 199362)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.cpp 2016-04-12 16:27:45 UTC (rev 199361)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.cpp 2016-04-12 16:30:50 UTC (rev 199362)
</span><span class="lines">@@ -44,8 +44,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- auto& effectiveRoot = root.shadowRoot() ? *root.shadowRoot() : root;
- m_contextStack.uncheckedAppend(Context(effectiveRoot));
</del><ins>+ if (auto* shadowRoot = root.shadowRoot()) {
+ auto* firstChild = shadowRoot->firstChild();
+ initializeContextStack(root, firstChild ? *firstChild : root);
+ return;
+ }
+
+ m_contextStack.uncheckedAppend(Context(root));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ComposedTreeIterator::ComposedTreeIterator(ContainerNode& root, Node& current)
</span><span class="lines">@@ -194,7 +199,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-String composedTreeAsText(ContainerNode& root)
</del><ins>+String composedTreeAsText(ContainerNode& root, ComposedTreeAsTextMode mode)
</ins><span class="cx"> {
</span><span class="cx"> TextStream stream;
</span><span class="cx"> auto descendants = composedTreeDescendants(root);
</span><span class="lines">@@ -202,13 +207,18 @@
</span><span class="cx"> writeIndent(stream, it.depth());
</span><span class="cx">
</span><span class="cx"> if (is<Text>(*it)) {
</span><del>- stream << "#text\n";
</del><ins>+ stream << "#text";
+ if (mode == ComposedTreeAsTextMode::WithPointers)
+ stream << " " << &*it;
+ stream << "\n";
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> auto& element = downcast<Element>(*it);
</span><span class="cx"> stream << element.localName();
</span><span class="cx"> if (element.shadowRoot())
</span><span class="cx"> stream << " (shadow root)";
</span><ins>+ if (mode == ComposedTreeAsTextMode::WithPointers)
+ stream << " " << &*it;
</ins><span class="cx"> stream << "\n";
</span><span class="cx"> }
</span><span class="cx"> return stream.release();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoredomComposedTreeIteratorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.h (199361 => 199362)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.h 2016-04-12 16:27:45 UTC (rev 199361)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ComposedTreeIterator.h 2016-04-12 16:30:50 UTC (rev 199362)
</span><span class="lines">@@ -203,7 +203,8 @@
</span><span class="cx"> return ComposedTreeChildAdapter(parent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WEBCORE_EXPORT String composedTreeAsText(ContainerNode& root);
</del><ins>+enum class ComposedTreeAsTextMode { Normal, WithPointers };
+WEBCORE_EXPORT String composedTreeAsText(ContainerNode& root, ComposedTreeAsTextMode = ComposedTreeAsTextMode::Normal);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>