<!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>[190430] 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/190430">190430</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-01 13:36:34 -0700 (Thu, 01 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Slot elements should support fallback contents
https://bugs.webkit.org/show_bug.cgi?id=149701
Reviewed by Antti Koivisto.
Source/WebCore:
Following discussions on Github discussions [1] [2], we're adding the default rule of `display: contents`
on slot elements and making slot elements render its children when there are no assigned nodes [3].
Make these changes by attaching renderers on direct-children of slot elements when there are no assigned
nodes during render tree construction. Note `display: contents` will be aded in webkit.org/b/149439.
[1] https://github.com/w3c/webcomponents/issues/317
[2] https://github.com/w3c/webcomponents/issues/308
[3] https://github.com/w3c/webcomponents/issues/308#issuecomment-143655347
Tests: fast/shadow-dom/css-scoping-shadow-slot-fallback.html
fast/shadow-dom/shadow-layout-after-slot-fallback-changes.html
* style/StyleResolveTree.cpp:
(WebCore::Style::attachSlotAssignees):
(WebCore::Style::detachSlotAssignees):
(WebCore::Style::resolveSlotAssignees):
LayoutTests:
Added tests for fallback contents in slot elements. One of them could be safely submitted to CSS WG,
and the other one is a style recalc test.
* fast/shadow-dom/css-scoping-shadow-slot-fallback-expected.html: Added.
* fast/shadow-dom/css-scoping-shadow-slot-fallback.html: Added.
* fast/shadow-dom/shadow-layout-after-slot-fallback-changes-expected.html: Added.
* fast/shadow-dom/shadow-layout-after-slot-fallback-changes.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomcssscopingshadowslotfallbackexpectedhtml">trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-fallback-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomcssscopingshadowslotfallbackhtml">trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-fallback.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomshadowlayoutafterslotfallbackchangesexpectedhtml">trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-fallback-changes-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomshadowlayoutafterslotfallbackchangeshtml">trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-fallback-changes.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190429 => 190430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-01 20:20:10 UTC (rev 190429)
+++ trunk/LayoutTests/ChangeLog 2015-10-01 20:36:34 UTC (rev 190430)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-10-01 Ryosuke Niwa <rniwa@webkit.org>
+
+ Slot elements should support fallback contents
+ https://bugs.webkit.org/show_bug.cgi?id=149701
+
+ Reviewed by Antti Koivisto.
+
+ Added tests for fallback contents in slot elements. One of them could be safely submitted to CSS WG,
+ and the other one is a style recalc test.
+
+ * fast/shadow-dom/css-scoping-shadow-slot-fallback-expected.html: Added.
+ * fast/shadow-dom/css-scoping-shadow-slot-fallback.html: Added.
+ * fast/shadow-dom/shadow-layout-after-slot-fallback-changes-expected.html: Added.
+ * fast/shadow-dom/shadow-layout-after-slot-fallback-changes.html: Added.
+
</ins><span class="cx"> 2015-10-01 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Add TypedArray.prototype functionality.
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomcssscopingshadowslotfallbackexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-fallback-expected.html (0 => 190430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-fallback-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-fallback-expected.html 2015-10-01 20:36:34 UTC (rev 190430)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <p>Test passes if you see a single 100px by 100px green box below.</p>
+ <div style="width: 100px; height: 100px; background: green;"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomcssscopingshadowslotfallbackhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-fallback.html (0 => 190430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-fallback.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-fallback.html 2015-10-01 20:36:34 UTC (rev 190430)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>CSS Scoping - slot element without distributed nodes must render its fallback content</title>
+ <link rel="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org"/>
+ <link rel="match" href="reference/green-box.html"/>
+</head>
+<body>
+ <style>
+ my-host {
+ display: block;
+ background-color: red;
+ width: 100px;
+ height: 50px;
+ }
+ .red {
+ background-color: red;
+ }
+ .green {
+ background-color: green;
+ }
+ div {
+ width: 100px;
+ height: 50px;
+ }
+ slot {
+ border: solid 10px red;
+ }
+ </style>
+ <p>Test passes if you see a single 100px by 100px green box below.</p>
+ <my-host></my-host>
+ <div class="red"><slot><div class="green"></div></slot></div>
+ <script>
+
+ try {
+ var shadowHost = document.querySelector('my-host');
+ shadowRoot = shadowHost.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<slot style="border: solid 10px red;">'
+ + '<div style="width: 100%; height: 100%; background-color: green;"></div></slot>';
+ } catch (exception) {
+ document.body.appendChild(document.createTextNode(exception));
+ }
+
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowlayoutafterslotfallbackchangesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-fallback-changes-expected.html (0 => 190430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-fallback-changes-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-fallback-changes-expected.html 2015-10-01 20:36:34 UTC (rev 190430)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <p>Test passes if you see a single 100px by 100px green box below.</p>
+ <div style="width: 100px; height: 100px; background: green;"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowlayoutafterslotfallbackchangeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-fallback-changes.html (0 => 190430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-fallback-changes.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-fallback-changes.html 2015-10-01 20:36:34 UTC (rev 190430)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>Test passes if you see a single 100px by 100px green box below.</p>
+<my-host id="host1"><div style="background: red;">FAIL</div></my-host>
+<my-host id="host2"><div slot="foo" style="background: red;">FAIL</div></my-host>
+<my-host id="host3"></my-host>
+<my-host id="host4" style="background: red;"><slot></slot></my-host>
+<my-host id="host5" style="background: green;"><slot><div style="background: red;"></div></slot></my-host>
+<style>
+
+my-host {
+ display: block;
+ width: 100px;
+ height: 20px;
+ overflow: hidden;
+}
+
+my-host div {
+ width: 100%;
+ height: 100%;
+}
+
+</style>
+<script>
+
+function forceLayout() {
+ if (window.internals)
+ internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
+ else
+ document.querySelector('p').getBoundingClientRect();
+}
+
+try {
+ var host1 = document.getElementById('host1');
+ host1.attachShadow({mode: 'open'}).innerHTML = '<slot><div style="width: 100%; height: 100%; background-color: green;"></div></slot>';
+
+ var host2 = document.getElementById('host2');
+ host2.attachShadow({mode: 'open'}).innerHTML = '<slot name="foo"><div style="width: 100%; height: 100%; background-color: green;"></div></slot>';
+
+ var host3 = document.getElementById('host3');
+ host3.attachShadow({mode: 'open'}).innerHTML = '<slot>FAIL</slot>';
+
+ forceLayout();
+
+ host1.removeChild(host1.firstChild);
+ forceLayout();
+
+ host2.firstChild.slot = 'bar';
+ forceLayout();
+
+ var child3 = document.createElement('div');
+ child3.style.backgroundColor = 'green';
+ host3.appendChild(child3);
+ forceLayout();
+
+ var host4 = document.getElementById('host4');
+ var child4 = document.createElement('div');
+ child4.style.backgroundColor = 'green';
+ host4.firstChild.appendChild(child4);
+
+ var host5 = document.getElementById('host5');
+ host5.firstChild.removeChild(host5.firstChild.firstChild);
+
+} catch (exception) {
+ document.body.appendChild(document.createTextNode(exception));
+}
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190429 => 190430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-01 20:20:10 UTC (rev 190429)
+++ trunk/Source/WebCore/ChangeLog 2015-10-01 20:36:34 UTC (rev 190430)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-10-01 Ryosuke Niwa <rniwa@webkit.org>
+
+ Slot elements should support fallback contents
+ https://bugs.webkit.org/show_bug.cgi?id=149701
+
+ Reviewed by Antti Koivisto.
+
+ Following discussions on Github discussions [1] [2], we're adding the default rule of `display: contents`
+ on slot elements and making slot elements render its children when there are no assigned nodes [3].
+
+ Make these changes by attaching renderers on direct-children of slot elements when there are no assigned
+ nodes during render tree construction. Note `display: contents` will be aded in webkit.org/b/149439.
+
+ [1] https://github.com/w3c/webcomponents/issues/317
+ [2] https://github.com/w3c/webcomponents/issues/308
+ [3] https://github.com/w3c/webcomponents/issues/308#issuecomment-143655347
+
+ Tests: fast/shadow-dom/css-scoping-shadow-slot-fallback.html
+ fast/shadow-dom/shadow-layout-after-slot-fallback-changes.html
+
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::attachSlotAssignees):
+ (WebCore::Style::detachSlotAssignees):
+ (WebCore::Style::resolveSlotAssignees):
+
</ins><span class="cx"> 2015-10-01 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Latch does not clear when a scroll snap animation is triggered
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (190429 => 190430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-10-01 20:20:10 UTC (rev 190429)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-10-01 20:36:34 UTC (rev 190430)
</span><span class="lines">@@ -480,6 +480,13 @@
</span><span class="cx"> else if (is<Element>(*child))
</span><span class="cx"> attachRenderTree(downcast<Element>(*child), inheritedStyle, renderTreePosition, nullptr);
</span><span class="cx"> }
</span><ins>+ } else {
+ for (Node* child = slot.firstChild(); child; child = child->nextSibling()) {
+ if (is<Text>(*child))
+ attachTextRenderer(downcast<Text>(*child), renderTreePosition);
+ else if (is<Element>(*child))
+ attachRenderTree(downcast<Element>(*child), inheritedStyle, renderTreePosition, nullptr);
+ }
</ins><span class="cx"> }
</span><span class="cx"> slot.clearNeedsStyleRecalc();
</span><span class="cx"> slot.clearChildNeedsStyleRecalc();
</span><span class="lines">@@ -581,6 +588,13 @@
</span><span class="cx"> else if (is<Element>(*child))
</span><span class="cx"> detachRenderTree(downcast<Element>(*child), detachType);
</span><span class="cx"> }
</span><ins>+ } else {
+ for (Node* child = slot.firstChild(); child; child = child->nextSibling()) {
+ if (is<Text>(*child))
+ detachTextRenderer(downcast<Text>(*child));
+ else if (is<Element>(*child))
+ detachRenderTree(downcast<Element>(*child), detachType);
+ }
</ins><span class="cx"> }
</span><span class="cx"> slot.clearNeedsStyleRecalc();
</span><span class="cx"> slot.clearChildNeedsStyleRecalc();
</span><span class="lines">@@ -852,6 +866,13 @@
</span><span class="cx"> else if (is<Element>(*child))
</span><span class="cx"> resolveTree(downcast<Element>(*child), inheritedStyle, renderTreePosition, change);
</span><span class="cx"> }
</span><ins>+ } else {
+ for (Node* child = slot.firstChild(); child; child = child->nextSibling()) {
+ if (is<Text>(*child))
+ resolveTextNode(downcast<Text>(*child), renderTreePosition);
+ else if (is<Element>(*child))
+ resolveTree(downcast<Element>(*child), inheritedStyle, renderTreePosition, change);
+ }
</ins><span class="cx"> }
</span><span class="cx"> slot.clearNeedsStyleRecalc();
</span><span class="cx"> slot.clearChildNeedsStyleRecalc();
</span></span></pre>
</div>
</div>
</body>
</html>