<!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>[206403] trunk</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/206403">206403</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-09-26 16:45:21 -0700 (Mon, 26 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Input elements don't work inside shadow tree
https://bugs.webkit.org/show_bug.cgi?id=160427
Reviewed by Darin Adler.
Source/WebCore:
There is a bug in ComposedTreeIterator. If the iterator is initialized with an initial state where the root
is inside a shadow tree it won't iterate into slots.
If an input element is in a shadow tree it generates narrowly scoped style updates. When RenderTreeUpdater
applies such an update the update root will be inside the shadow tree and the bug will prevent the render tree
for slotted content from updating.
Added tests for both the iterator behavior and the specific symptom with input elements.
Tests: fast/shadow-dom/composed-tree-shadow-child-subtree.html
fast/shadow-dom/input-element-in-shadow.html
* dom/ComposedTreeIterator.cpp:
(WebCore::ComposedTreeIterator::ComposedTreeIterator):
Check and cache if the root is inside shadow tree.
(WebCore::ComposedTreeIterator::traverseNextInShadowTree):
* dom/ComposedTreeIterator.h:
(WebCore::ComposedTreeIterator::traverseNext):
If it is, always use the shadow traversal code path.
LayoutTests:
* fast/shadow-dom/composed-tree-shadow-child-subtree-expected.txt: Added.
* fast/shadow-dom/composed-tree-shadow-child-subtree.html: Added.
* fast/shadow-dom/input-element-in-shadow-expected.html: Added.
* fast/shadow-dom/input-element-in-shadow.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomComposedTreeIteratorcpp">trunk/Source/WebCore/dom/ComposedTreeIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoredomComposedTreeIteratorh">trunk/Source/WebCore/dom/ComposedTreeIterator.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomcomposedtreeshadowchildsubtreeexpectedtxt">trunk/LayoutTests/fast/shadow-dom/composed-tree-shadow-child-subtree-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomcomposedtreeshadowchildsubtreehtml">trunk/LayoutTests/fast/shadow-dom/composed-tree-shadow-child-subtree.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdominputelementinshadowexpectedhtml">trunk/LayoutTests/fast/shadow-dom/input-element-in-shadow-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdominputelementinshadowhtml">trunk/LayoutTests/fast/shadow-dom/input-element-in-shadow.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206402 => 206403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-26 23:40:06 UTC (rev 206402)
+++ trunk/LayoutTests/ChangeLog 2016-09-26 23:45:21 UTC (rev 206403)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-09-26 Antti Koivisto <antti@apple.com>
+
+ Input elements don't work inside shadow tree
+ https://bugs.webkit.org/show_bug.cgi?id=160427
+
+ Reviewed by Darin Adler.
+
+ * fast/shadow-dom/composed-tree-shadow-child-subtree-expected.txt: Added.
+ * fast/shadow-dom/composed-tree-shadow-child-subtree.html: Added.
+ * fast/shadow-dom/input-element-in-shadow-expected.html: Added.
+ * fast/shadow-dom/input-element-in-shadow.html: Added.
+
</ins><span class="cx"> 2016-09-26 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking media/media-document-audio-repaint.html as flaky on Sierra.
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomcomposedtreeshadowchildsubtreeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/composed-tree-shadow-child-subtree-expected.txt (0 => 206403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/composed-tree-shadow-child-subtree-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/composed-tree-shadow-child-subtree-expected.txt 2016-09-26 23:45:21 UTC (rev 206403)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+
+Test 1.1
+ div (shadow root)
+ div
+ slot
+ #text
+
+Shadow child 0 subtree
+ slot
+ #text
+
+Test 1.2
+ div (shadow root)
+ div
+ slot
+ div
+ #text
+
+Shadow child 0 subtree
+ slot
+ div
+ #text
+
+Test 2.1
+ div (shadow root)
+ div
+ #text
+ div
+ slot
+ #text
+
+Shadow child 0 subtree
+ #text
+
+Shadow child 1 subtree
+ slot
+ #text
+
+Test 2.2
+ div (shadow root)
+ div
+ #text
+ div
+ slot
+ div
+ #text
+
+Shadow child 0 subtree
+ #text
+
+Shadow child 1 subtree
+ slot
+ div
+ #text
+
+Test 3.1
+ div (shadow root)
+ div
+ #text
+ div (shadow root)
+ div
+ slot
+ slot
+ #text
+
+Shadow child 0 subtree
+ #text
+ div (shadow root)
+ div
+ slot
+ slot
+ #text
+
+Test 3.2
+ div (shadow root)
+ div
+ #text
+ div (shadow root)
+ div
+ slot
+ slot
+ div
+ #text
+
+Shadow child 0 subtree
+ #text
+ div (shadow root)
+ div
+ slot
+ slot
+ div
+ #text
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomcomposedtreeshadowchildsubtreehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/composed-tree-shadow-child-subtree.html (0 => 206403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/composed-tree-shadow-child-subtree.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/composed-tree-shadow-child-subtree.html 2016-09-26 23:45:21 UTC (rev 206403)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<html>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+
+<template id=shadow1><div><slot></slot></div></template>
+<template id=shadow2><div>text</div><div><slot></slot></div></template>
+<template id=shadow3><div>text<div shadow=shadow1><slot></slot></div></div></template>
+
+
+<template test=1.1><div shadow=shadow1>text</div></template>
+<template test=1.2><div shadow=shadow1><div>text</div></div></template>
+
+<template test=2.1><div shadow=shadow2>text</div></template>
+<template test=2.2><div shadow=shadow2><div>text</div></div></template>
+
+<template test=3.1><div shadow=shadow3>text</div></template>
+<template test=3.2><div shadow=shadow3><div>text</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);
+
+ var shadowSubtree = test.querySelector("[shadow]");
+
+ var children = shadowSubtree.shadowRoot.children;
+ for (var j = 0; j < children.length; ++j) {
+ console.innerText += "\nShadow child " + j + " subtree\n"
+ console.innerText += internals.composedTreeAsText(children[j]);
+ }
+}
+
+</script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdominputelementinshadowexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/input-element-in-shadow-expected.html (0 => 206403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/input-element-in-shadow-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/input-element-in-shadow-expected.html 2016-09-26 23:45:21 UTC (rev 206403)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+Test that input elements in shadow trees update when text is entered.
+<div>
+<input value="abc"><br>
+<textarea>def</textarea>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdominputelementinshadowhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/input-element-in-shadow.html (0 => 206403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/input-element-in-shadow.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/input-element-in-shadow.html 2016-09-26 23:45:21 UTC (rev 206403)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+Test that input elements in shadow trees update when text is entered.
+<div id="parentDiv">
+<input placeholder="distributed"><br>
+<textarea></textarea>
+</div>
+</body>
+<script>
+parentDiv.attachShadow({mode: 'open'});
+var innerDiv = document.createElement('div');
+innerDiv.appendChild(document.createElement('slot'))
+parentDiv.shadowRoot.appendChild(innerDiv);
+
+function enterText(selector, characters)
+{
+ if (window.eventSender) {
+ var input = document.querySelector(selector);
+ input.focus();
+ for (c of characters)
+ window.eventSender.keyDown(c);
+ input.blur();
+ }
+}
+
+enterText("input", "abc");
+enterText("textarea", "def");
+
+</script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (206402 => 206403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-09-26 23:40:06 UTC (rev 206402)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-09-26 23:45:21 UTC (rev 206403)
</span><span class="lines">@@ -332,6 +332,7 @@
</span><span class="cx"> # This test relies on EventSender.keydown(), which is not supported on iOS
</span><span class="cx"> webkit.org/b/155233 fast/events/max-tabindex-focus.html [ Skip ]
</span><span class="cx"> fast/shadow-dom/shadow-host-removal-crash.html [ Skip ]
</span><ins>+fast/shadow-dom/input-element-in-shadow.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # The file-wrapper part of <attachment> is not yet working on iOS
</span><span class="cx"> fast/attachment/attachment-type-attribute.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206402 => 206403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-26 23:40:06 UTC (rev 206402)
+++ trunk/Source/WebCore/ChangeLog 2016-09-26 23:45:21 UTC (rev 206403)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-09-26 Antti Koivisto <antti@apple.com>
+
+ Input elements don't work inside shadow tree
+ https://bugs.webkit.org/show_bug.cgi?id=160427
+
+ Reviewed by Darin Adler.
+
+ There is a bug in ComposedTreeIterator. If the iterator is initialized with an initial state where the root
+ is inside a shadow tree it won't iterate into slots.
+
+ If an input element is in a shadow tree it generates narrowly scoped style updates. When RenderTreeUpdater
+ applies such an update the update root will be inside the shadow tree and the bug will prevent the render tree
+ for slotted content from updating.
+
+ Added tests for both the iterator behavior and the specific symptom with input elements.
+
+ Tests: fast/shadow-dom/composed-tree-shadow-child-subtree.html
+ fast/shadow-dom/input-element-in-shadow.html
+
+ * dom/ComposedTreeIterator.cpp:
+ (WebCore::ComposedTreeIterator::ComposedTreeIterator):
+
+ Check and cache if the root is inside shadow tree.
+
+ (WebCore::ComposedTreeIterator::traverseNextInShadowTree):
+ * dom/ComposedTreeIterator.h:
+ (WebCore::ComposedTreeIterator::traverseNext):
+
+ If it is, always use the shadow traversal code path.
+
</ins><span class="cx"> 2016-09-26 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Seeking video doesn't update seek position
</span></span></pre></div>
<a id="trunkSourceWebCoredomComposedTreeIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ComposedTreeIterator.cpp (206402 => 206403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ComposedTreeIterator.cpp 2016-09-26 23:40:06 UTC (rev 206402)
+++ trunk/Source/WebCore/dom/ComposedTreeIterator.cpp 2016-09-26 23:45:21 UTC (rev 206403)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ComposedTreeIterator::ComposedTreeIterator(ContainerNode& root, FirstChildTag)
</span><ins>+ : m_rootIsInShadowTree(root.isInShadowTree())
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!is<ShadowRoot>(root));
</span><span class="cx">
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ComposedTreeIterator::ComposedTreeIterator(ContainerNode& root, Node& current)
</span><ins>+ : m_rootIsInShadowTree(root.isInShadowTree())
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!is<ShadowRoot>(root));
</span><span class="cx"> ASSERT(!is<ShadowRoot>(current));
</span><span class="lines">@@ -155,7 +157,7 @@
</span><span class="cx">
</span><span class="cx"> void ComposedTreeIterator::traverseNextInShadowTree()
</span><span class="cx"> {
</span><del>- ASSERT(m_contextStack.size() > 1);
</del><ins>+ ASSERT(m_contextStack.size() > 1 || m_rootIsInShadowTree);
</ins><span class="cx">
</span><span class="cx"> if (is<HTMLSlotElement>(current())) {
</span><span class="cx"> auto& slot = downcast<HTMLSlotElement>(current());
</span><span class="lines">@@ -175,8 +177,6 @@
</span><span class="cx">
</span><span class="cx"> void ComposedTreeIterator::traverseNextLeavingContext()
</span><span class="cx"> {
</span><del>- ASSERT(m_contextStack.size() > 1);
-
</del><span class="cx"> while (context().iterator == context().end && m_contextStack.size() > 1) {
</span><span class="cx"> m_contextStack.removeLast();
</span><span class="cx"> if (context().iterator == context().end)
</span></span></pre></div>
<a id="trunkSourceWebCoredomComposedTreeIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ComposedTreeIterator.h (206402 => 206403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ComposedTreeIterator.h 2016-09-26 23:40:06 UTC (rev 206402)
+++ trunk/Source/WebCore/dom/ComposedTreeIterator.h 2016-09-26 23:45:21 UTC (rev 206403)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> const Context& context() const { return m_contextStack.last(); }
</span><span class="cx"> Node& current() { return *context().iterator; }
</span><span class="cx">
</span><ins>+ bool m_rootIsInShadowTree { false };
</ins><span class="cx"> bool m_didDropAssertions { false };
</span><span class="cx"> Vector<Context, 8> m_contextStack;
</span><span class="cx"> };
</span><span class="lines">@@ -96,7 +97,7 @@
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_contextStack.size() > 1) {
</del><ins>+ if (m_contextStack.size() > 1 || m_rootIsInShadowTree) {
</ins><span class="cx"> traverseNextInShadowTree();
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="lines">@@ -109,7 +110,7 @@
</span><span class="cx"> {
</span><span class="cx"> context().iterator.traverseNextSkippingChildren();
</span><span class="cx">
</span><del>- if (context().iterator == context().end && m_contextStack.size() > 1)
</del><ins>+ if (context().iterator == context().end)
</ins><span class="cx"> traverseNextLeavingContext();
</span><span class="cx">
</span><span class="cx"> return *this;
</span></span></pre>
</div>
</div>
</body>
</html>