<!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>[190323] 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/190323">190323</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-29 13:22:18 -0700 (Tue, 29 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update style/layout when a slot is added or removed
https://bugs.webkit.org/show_bug.cgi?id=149593
Reviewed by Antti Koivisto.
Source/WebCore:
Fixed the bug by forcing the render tree reconstruction on the shadow host when a slot is inserted or removed.
We should optimize these reconstructions by only triggering them on the affected slot elements in the future.
Also fixed a bug that we were not invalidating the slot assignments when a default slot is introduced dynamically
after the slot assignment algorithm had run.
Test (existing): fast/shadow-dom/shadow-layout-after-slot-changes.html
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::addSlotElementByName): Passes in ShadowRoot.
(WebCore::ShadowRoot::removeSlotElementByName): Ditto.
* dom/SlotAssignment.cpp:
(WebCore::SlotAssignment::addSlotElementByName): Call setNeedsStyleRecalc.
(WebCore::SlotAssignment::removeSlotElementByName): Call setNeedsStyleRecalc if the host is still alive since this
function can be called while the host is being destructed in which case shadowRoot.host() would be nullptr.
* dom/SlotAssignment.h:
LayoutTests:
Removed failing test expectations from fast/shadow-dom/shadow-layout-after-slot-changes.html
Also added an explicit test case for when a default slot is introduced dynamically after
calling getDistributedNodes() once, thereby forcing the slot assignments.
* fast/shadow-dom/HTMLSlotElement-interface-expected.txt:
* fast/shadow-dom/HTMLSlotElement-interface.html:
* fast/shadow-dom/shadow-layout-after-slot-changes.html:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomHTMLSlotElementinterfaceexpectedtxt">trunk/LayoutTests/fast/shadow-dom/HTMLSlotElement-interface-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomHTMLSlotElementinterfacehtml">trunk/LayoutTests/fast/shadow-dom/HTMLSlotElement-interface.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomShadowRootcpp">trunk/Source/WebCore/dom/ShadowRoot.cpp</a></li>
<li><a href="#trunkSourceWebCoredomSlotAssignmentcpp">trunk/Source/WebCore/dom/SlotAssignment.cpp</a></li>
<li><a href="#trunkSourceWebCoredomSlotAssignmenth">trunk/Source/WebCore/dom/SlotAssignment.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190322 => 190323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-29 19:20:36 UTC (rev 190322)
+++ trunk/LayoutTests/ChangeLog 2015-09-29 20:22:18 UTC (rev 190323)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-09-29 Ryosuke Niwa <rniwa@webkit.org>
+
+ Update style/layout when a slot is added or removed
+ https://bugs.webkit.org/show_bug.cgi?id=149593
+
+ Reviewed by Antti Koivisto.
+
+ Removed failing test expectations from fast/shadow-dom/shadow-layout-after-slot-changes.html
+
+ Also added an explicit test case for when a default slot is introduced dynamically after
+ calling getDistributedNodes() once, thereby forcing the slot assignments.
+
+ * fast/shadow-dom/HTMLSlotElement-interface-expected.txt:
+ * fast/shadow-dom/HTMLSlotElement-interface.html:
+ * fast/shadow-dom/shadow-layout-after-slot-changes.html:
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2015-09-29 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Update test expectations to mark quicklook/pages.html as crashing
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomHTMLSlotElementinterfaceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shadow-dom/HTMLSlotElement-interface-expected.txt (190322 => 190323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/HTMLSlotElement-interface-expected.txt 2015-09-29 19:20:36 UTC (rev 190322)
+++ trunk/LayoutTests/fast/shadow-dom/HTMLSlotElement-interface-expected.txt 2015-09-29 20:22:18 UTC (rev 190323)
</span><span class="lines">@@ -3,5 +3,6 @@
</span><span class="cx"> PASS "name" attribute on HTMLSlotElement must reflect "name" attribute
</span><span class="cx"> PASS getDistributedNodes method on HTMLSlotElement must return the list of distributed nodes
</span><span class="cx"> PASS getDistributedNodes must update when slot and name attributes are modified
</span><ins>+PASS getDistributedNodes must update when a default slot is introduced dynamically by a slot rename
</ins><span class="cx"> PASS getDistributedNodes must update when slot elements are inserted or removed
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomHTMLSlotElementinterfacehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shadow-dom/HTMLSlotElement-interface.html (190322 => 190323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/HTMLSlotElement-interface.html 2015-09-29 19:20:36 UTC (rev 190322)
+++ trunk/LayoutTests/fast/shadow-dom/HTMLSlotElement-interface.html 2015-09-29 20:22:18 UTC (rev 190323)
</span><span class="lines">@@ -92,6 +92,23 @@
</span><span class="cx">
</span><span class="cx"> test(function () {
</span><span class="cx"> var shadowHost = document.createElement('div');
</span><ins>+ var child = document.createElement('span');
+ shadowHost.appendChild(child);
+
+ var shadowRoot = shadowHost.attachShadow({mode: 'open'});
+ var slotElement = document.createElement('slot');
+ slotElement.name = 'foo';
+ shadowRoot.appendChild(slotElement);
+
+ assert_array_equals(slotElement.getDistributedNodes(), [], 'getDistributedNodes must be empty when there are no matching elements for the slot name');
+
+ slotElement.name = null;
+ assert_array_equals(slotElement.getDistributedNodes(), [child], 'getDistributedNodes must be empty when there are no matching elements for the slot name');
+
+}, 'getDistributedNodes must update when a default slot is introduced dynamically by a slot rename');
+
+test(function () {
+ var shadowHost = document.createElement('div');
</ins><span class="cx"> var p = document.createElement('p');
</span><span class="cx"> var text = document.createTextNode('');
</span><span class="cx"> var b = document.createElement('b');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (190322 => 190323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-09-29 19:20:36 UTC (rev 190322)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-09-29 20:22:18 UTC (rev 190323)
</span><span class="lines">@@ -1330,7 +1330,6 @@
</span><span class="cx"> webkit.org/b/149440 fast/shadow-dom/css-scoping-shadow-host-functional-rule.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/149441 fast/shadow-dom/css-scoping-shadow-slotted-rule.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/149441 fast/shadow-dom/css-scoping-shadow-slot-display-override.html [ ImageOnlyFailure ]
</span><del>-webkit.org/b/149593 fast/shadow-dom/shadow-layout-after-slot-changes.html [ ImageOnlyFailure ]
</del><span class="cx">
</span><span class="cx"> webkit.org/b/149510 accessibility/mac/aria-expanded-notifications.html [ Pass Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190322 => 190323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-29 19:20:36 UTC (rev 190322)
+++ trunk/Source/WebCore/ChangeLog 2015-09-29 20:22:18 UTC (rev 190323)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-09-29 Ryosuke Niwa <rniwa@webkit.org>
+
+ Update style/layout when a slot is added or removed
+ https://bugs.webkit.org/show_bug.cgi?id=149593
+
+ Reviewed by Antti Koivisto.
+
+ Fixed the bug by forcing the render tree reconstruction on the shadow host when a slot is inserted or removed.
+ We should optimize these reconstructions by only triggering them on the affected slot elements in the future.
+
+ Also fixed a bug that we were not invalidating the slot assignments when a default slot is introduced dynamically
+ after the slot assignment algorithm had run.
+
+ Test (existing): fast/shadow-dom/shadow-layout-after-slot-changes.html
+
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::addSlotElementByName): Passes in ShadowRoot.
+ (WebCore::ShadowRoot::removeSlotElementByName): Ditto.
+ * dom/SlotAssignment.cpp:
+ (WebCore::SlotAssignment::addSlotElementByName): Call setNeedsStyleRecalc.
+ (WebCore::SlotAssignment::removeSlotElementByName): Call setNeedsStyleRecalc if the host is still alive since this
+ function can be called while the host is being destructed in which case shadowRoot.host() would be nullptr.
+ * dom/SlotAssignment.h:
+
</ins><span class="cx"> 2015-09-29 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Improve binding of JSBuiltinConstructor classes
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (190322 => 190323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2015-09-29 19:20:36 UTC (rev 190322)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2015-09-29 20:22:18 UTC (rev 190323)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -189,12 +190,12 @@
</span><span class="cx"> if (!m_slotAssignments)
</span><span class="cx"> m_slotAssignments = std::make_unique<SlotAssignment>();
</span><span class="cx">
</span><del>- return m_slotAssignments->addSlotElementByName(name, slot);
</del><ins>+ return m_slotAssignments->addSlotElementByName(name, slot, *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ShadowRoot::removeSlotElementByName(const AtomicString& name, HTMLSlotElement& slot)
</span><span class="cx"> {
</span><del>- return m_slotAssignments->removeSlotElementByName(name, slot);
</del><ins>+ return m_slotAssignments->removeSlotElementByName(name, slot, *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ShadowRoot::invalidateSlotAssignments()
</span></span></pre></div>
<a id="trunkSourceWebCoredomSlotAssignmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SlotAssignment.cpp (190322 => 190323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SlotAssignment.cpp 2015-09-29 19:20:36 UTC (rev 190322)
+++ trunk/Source/WebCore/dom/SlotAssignment.cpp 2015-09-29 20:22:18 UTC (rev 190323)
</span><span class="lines">@@ -51,16 +51,22 @@
</span><span class="cx"> return findFirstSlotElement(*it->value, shadowRoot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SlotAssignment::addSlotElementByName(const AtomicString& name, HTMLSlotElement& slotElement)
</del><ins>+void SlotAssignment::addSlotElementByName(const AtomicString& name, HTMLSlotElement& slotElement, ShadowRoot& shadowRoot)
</ins><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> ASSERT(!m_slotElementsForConsistencyCheck.contains(&slotElement));
</span><span class="cx"> m_slotElementsForConsistencyCheck.add(&slotElement);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- auto addResult = m_slots.add(treatNullAsEmpty(name), std::unique_ptr<SlotInfo>());
</del><ins>+ // FIXME: We should be able to do a targeted reconstruction.
+ shadowRoot.host()->setNeedsStyleRecalc(ReconstructRenderTree);
+
+ const AtomicString& key = treatNullAsEmpty(name);
+ auto addResult = m_slots.add(key, std::unique_ptr<SlotInfo>());
</ins><span class="cx"> if (addResult.isNewEntry) {
</span><span class="cx"> addResult.iterator->value = std::make_unique<SlotInfo>(slotElement);
</span><ins>+ if (key == emptyAtom) // Because assignSlots doesn't collect nodes assgined to the default slot as an optimzation.
+ m_slotAssignmentsIsValid = false;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -77,13 +83,16 @@
</span><span class="cx"> slotInfo.elementCount++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SlotAssignment::removeSlotElementByName(const AtomicString& name, HTMLSlotElement& slotElement)
</del><ins>+void SlotAssignment::removeSlotElementByName(const AtomicString& name, HTMLSlotElement& slotElement, ShadowRoot& shadowRoot)
</ins><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> ASSERT(m_slotElementsForConsistencyCheck.contains(&slotElement));
</span><span class="cx"> m_slotElementsForConsistencyCheck.remove(&slotElement);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (auto* host = shadowRoot.host()) // FIXME: We should be able to do a targeted reconstruction.
+ host->setNeedsStyleRecalc(ReconstructRenderTree);
+
</ins><span class="cx"> auto it = m_slots.find(treatNullAsEmpty(name));
</span><span class="cx"> RELEASE_ASSERT(it != m_slots.end());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomSlotAssignmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SlotAssignment.h (190322 => 190323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SlotAssignment.h 2015-09-29 19:20:36 UTC (rev 190322)
+++ trunk/Source/WebCore/dom/SlotAssignment.h 2015-09-29 20:22:18 UTC (rev 190323)
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx">
</span><span class="cx"> HTMLSlotElement* findAssignedSlot(const Node&, ShadowRoot&);
</span><span class="cx">
</span><del>- void addSlotElementByName(const AtomicString&, HTMLSlotElement&);
- void removeSlotElementByName(const AtomicString&, HTMLSlotElement&);
</del><ins>+ void addSlotElementByName(const AtomicString&, HTMLSlotElement&, ShadowRoot&);
+ void removeSlotElementByName(const AtomicString&, HTMLSlotElement&, ShadowRoot&);
</ins><span class="cx">
</span><span class="cx"> const Vector<Node*>* assignedNodesForSlot(const HTMLSlotElement&, ShadowRoot&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>