<!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>[190109] 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/190109">190109</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-22 01:17:09 -0700 (Tue, 22 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>invalidateSlotAssignments should trigger style recalc
https://bugs.webkit.org/show_bug.cgi?id=149447
Reviewed by Antti Koivisto.
Source/WebCore:
Invalidate the render tree of a shadow host when a new child is inserted, an existing child is removed,
or slot attribute of a child is modified.
No new tests. Covered by existing tests added in <a href="http://trac.webkit.org/projects/webkit/changeset/190101">r190101</a>.
* dom/Element.cpp:
(WebCore::Element::childrenChanged): Call invalidateSlotAssignments or invalidateDefaultSlotAssignments
depending on the types of children being inserted or removed since text nodes can only be assigned into
a default slot.
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::invalidateSlotAssignments):
(WebCore::ShadowRoot::invalidateDefaultSlotAssignments): Added.
* dom/ShadowRoot.h:
* dom/SlotAssignment.cpp:
(WebCore::SlotAssignment::invalidate): Reconstruct the render tree for the whole host. We can optimize
in the future by only invalidating active slot elements instead.
(WebCore::SlotAssignment::invalidateDefaultSlot): Added.
* dom/SlotAssignment.h:
LayoutTests:
Removed failing expectations from newly passing tests.
Also added test cases for inserting and removing text nodes, and modified the style recalc tests
to force layout between each DOM change to test case separately.
* fast/shadow-dom/shadow-layout-after-host-child-changes.html:
* fast/shadow-dom/shadow-layout-after-inserting-or-removing-host-child.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="#trunkLayoutTestsfastshadowdomshadowlayoutafterhostchildchangeshtml">trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-host-child-changes.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomshadowlayoutafterinsertingorremovinghostchildhtml">trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-inserting-or-removing-host-child.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomshadowlayoutafterslotchangeshtml">trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-changes.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="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomShadowRootcpp">trunk/Source/WebCore/dom/ShadowRoot.cpp</a></li>
<li><a href="#trunkSourceWebCoredomShadowRooth">trunk/Source/WebCore/dom/ShadowRoot.h</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 (190108 => 190109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-22 07:35:27 UTC (rev 190108)
+++ trunk/LayoutTests/ChangeLog 2015-09-22 08:17:09 UTC (rev 190109)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-09-22 Ryosuke Niwa <rniwa@webkit.org>
+
+ invalidateSlotAssignments should trigger style recalc
+ https://bugs.webkit.org/show_bug.cgi?id=149447
+
+ Reviewed by Antti Koivisto.
+
+ Removed failing expectations from newly passing tests.
+
+ Also added test cases for inserting and removing text nodes, and modified the style recalc tests
+ to force layout between each DOM change to test case separately.
+
+ * fast/shadow-dom/shadow-layout-after-host-child-changes.html:
+ * fast/shadow-dom/shadow-layout-after-inserting-or-removing-host-child.html:
+ * fast/shadow-dom/shadow-layout-after-slot-changes.html:
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2015-09-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> time element should use HTMLTimeElement interface
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowlayoutafterhostchildchangeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-host-child-changes.html (190108 => 190109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-host-child-changes.html 2015-09-22 07:35:27 UTC (rev 190108)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-host-child-changes.html 2015-09-22 08:17:09 UTC (rev 190109)
</span><span class="lines">@@ -23,6 +23,13 @@
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span><span class="cx">
</span><ins>+function forceLayout() {
+ if (window.internals)
+ internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
+ else
+ document.querySelector('p').getBoundingClientRect();
+}
+
</ins><span class="cx"> try {
</span><span class="cx"> var host1 = document.getElementById('host1');
</span><span class="cx"> host1.attachShadow({mode: 'open'}).innerHTML = '<slot></slot>';
</span><span class="lines">@@ -36,14 +43,20 @@
</span><span class="cx"> var host4 = document.getElementById('host4');
</span><span class="cx"> host4.attachShadow({mode: 'open'}).innerHTML = '<slot></slot>';
</span><span class="cx">
</span><del>- if (window.internals)
- internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
- else
- document.querySelector('p').getBoundingClientRect();
</del><ins>+ forceLayout();
</ins><span class="cx">
</span><span class="cx"> host1.removeChild(host1.firstChild);
</span><ins>+
+ forceLayout();
+
</ins><span class="cx"> host2.firstChild.slot = 'bar';
</span><ins>+
+ forceLayout();
+
</ins><span class="cx"> host3.firstChild.slot = null;
</span><ins>+
+ forceLayout();
+
</ins><span class="cx"> var greenBox = document.createElement('div');
</span><span class="cx"> greenBox.style.backgroundColor = 'green';
</span><span class="cx"> host4.insertBefore(greenBox, host4.firstChild);
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowlayoutafterinsertingorremovinghostchildhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-inserting-or-removing-host-child.html (190108 => 190109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-inserting-or-removing-host-child.html 2015-09-22 07:35:27 UTC (rev 190108)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-inserting-or-removing-host-child.html 2015-09-22 08:17:09 UTC (rev 190109)
</span><span class="lines">@@ -2,40 +2,63 @@
</span><span class="cx"> <html>
</span><span class="cx"> <body>
</span><span class="cx"> <p>Test passes if you see a single 100px by 100px green box below.</p>
</span><del>-<green-host style="background: green;"><span>FAIL</span></green-host>
-<red-host style="background: red;"></red-host>
</del><ins>+<my-host id="host1" style="background: green;"><span>FAIL</span></my-host>
+<my-host id="host2" style="background: red;"></my-host>
+<my-host id="host3" style="background: green;">FAIL</my-host>
+<my-host id="host4" style="background: green;">FAIL</my-host>
</ins><span class="cx"> <style>
</span><span class="cx">
</span><del>-green-host, red-host {
</del><ins>+my-host {
</ins><span class="cx"> display: block;
</span><span class="cx"> width: 100px;
</span><del>- height: 50px;
</del><ins>+ height: 25px;
</ins><span class="cx"> overflow: hidden;
</span><ins>+ font-size: 30px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span><span class="cx">
</span><del>-try {
- var greenHost = document.querySelector('green-host');
- greenHost.attachShadow({mode: 'open'}).innerHTML = '<slot></slot>';
-
- var redHost = document.querySelector('red-host');
- redHost.attachShadow({mode: 'open'}).innerHTML = '<slot></slot>FAIL';
-
</del><ins>+function forceLayout() {
</ins><span class="cx"> if (window.internals)
</span><span class="cx"> internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
</span><span class="cx"> else
</span><del>- document.querySelector('span').getBoundingClientRect();
</del><ins>+ document.querySelector('p').getBoundingClientRect();
+}
</ins><span class="cx">
</span><del>- greenHost.removeChild(greenHost.firstChild);
</del><ins>+try {
+ var host1 = document.getElementById('host1');
+ host1.attachShadow({mode: 'open'}).innerHTML = '<slot></slot>';
</ins><span class="cx">
</span><ins>+ var host2 = document.getElementById('host2');
+ host2.attachShadow({mode: 'open'}).innerHTML = '<slot></slot>FAIL';
+
+ var host3 = document.getElementById('host3');
+ host3.attachShadow({mode: 'open'}).innerHTML = '<slot></slot>';
+
+ var host4 = document.getElementById('host4');
+ host4.attachShadow({mode: 'open'}).innerHTML = '<slot></slot>';
+
+ forceLayout();
+
+ host1.removeChild(host1.firstChild);
+
+ forceLayout();
+
</ins><span class="cx"> var greenChild = document.createElement('div');
</span><span class="cx"> greenChild.style.width = '100%';
</span><span class="cx"> greenChild.style.height = '100%';
</span><span class="cx"> greenChild.style.backgroundColor = 'green';
</span><del>- redHost.appendChild(greenChild);
</del><ins>+ host2.appendChild(greenChild);
</ins><span class="cx">
</span><ins>+ forceLayout();
+
+ host3.removeChild(host3.firstChild);
+
+ forceLayout();
+
+ host4.insertBefore(document.createTextNode('________'), host4.firstChild);
+
</ins><span class="cx"> } catch (exception) {
</span><span class="cx"> document.body.appendChild(document.createTextNode(exception));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowlayoutafterslotchangeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-changes.html (190108 => 190109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-changes.html 2015-09-22 07:35:27 UTC (rev 190108)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-layout-after-slot-changes.html 2015-09-22 08:17:09 UTC (rev 190109)
</span><span class="lines">@@ -23,6 +23,13 @@
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span><span class="cx">
</span><ins>+function forceLayout() {
+ if (window.internals)
+ internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
+ else
+ document.querySelector('p').getBoundingClientRect();
+}
+
</ins><span class="cx"> try {
</span><span class="cx"> var shadow1 = document.getElementById('host1').attachShadow({mode: 'open'});
</span><span class="cx"> shadow1.innerHTML = '<slot></slot>';
</span><span class="lines">@@ -36,14 +43,17 @@
</span><span class="cx"> var shadow4 = document.getElementById('host4').attachShadow({mode: 'open'});
</span><span class="cx"> shadow4.innerHTML = 'FAIL';
</span><span class="cx">
</span><del>- if (window.internals)
- internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
- else
- document.querySelector('p').getBoundingClientRect();
</del><ins>+ forceLayout();
</ins><span class="cx">
</span><span class="cx"> shadow1.removeChild(shadow1.firstChild);
</span><ins>+ forceLayout();
+
</ins><span class="cx"> shadow2.firstChild.name = 'bar';
</span><ins>+ forceLayout();
+
</ins><span class="cx"> shadow3.firstChild.name = null;
</span><ins>+ forceLayout();
+
</ins><span class="cx"> shadow4.insertBefore(document.createElement('slot'), shadow4.firstChild);
</span><span class="cx">
</span><span class="cx"> } catch (exception) {
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (190108 => 190109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-09-22 07:35:27 UTC (rev 190108)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-09-22 08:17:09 UTC (rev 190109)
</span><span class="lines">@@ -1308,6 +1308,4 @@
</span><span class="cx"> webkit.org/b/149328 fast/shadow-dom/css-scoping-shadow-host-functional-rule.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/149328 fast/shadow-dom/css-scoping-shadow-slotted-rule.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/149328 fast/shadow-dom/css-scoping-shadow-slot-display-override.html [ ImageOnlyFailure ]
</span><del>-webkit.org/b/149328 fast/shadow-dom/shadow-layout-after-host-child-changes.html [ ImageOnlyFailure ]
-webkit.org/b/149328 fast/shadow-dom/shadow-layout-after-inserting-or-removing-host-child.html [ ImageOnlyFailure ]
</del><span class="cx"> webkit.org/b/149328 fast/shadow-dom/shadow-layout-after-slot-changes.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190108 => 190109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-22 07:35:27 UTC (rev 190108)
+++ trunk/Source/WebCore/ChangeLog 2015-09-22 08:17:09 UTC (rev 190109)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-09-22 Ryosuke Niwa <rniwa@webkit.org>
+
+ invalidateSlotAssignments should trigger style recalc
+ https://bugs.webkit.org/show_bug.cgi?id=149447
+
+ Reviewed by Antti Koivisto.
+
+ Invalidate the render tree of a shadow host when a new child is inserted, an existing child is removed,
+ or slot attribute of a child is modified.
+
+ No new tests. Covered by existing tests added in r190101.
+
+ * dom/Element.cpp:
+ (WebCore::Element::childrenChanged): Call invalidateSlotAssignments or invalidateDefaultSlotAssignments
+ depending on the types of children being inserted or removed since text nodes can only be assigned into
+ a default slot.
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::invalidateSlotAssignments):
+ (WebCore::ShadowRoot::invalidateDefaultSlotAssignments): Added.
+ * dom/ShadowRoot.h:
+ * dom/SlotAssignment.cpp:
+ (WebCore::SlotAssignment::invalidate): Reconstruct the render tree for the whole host. We can optimize
+ in the future by only invalidating active slot elements instead.
+ (WebCore::SlotAssignment::invalidateDefaultSlot): Added.
+ * dom/SlotAssignment.h:
+
</ins><span class="cx"> 2015-09-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> time element should use HTMLTimeElement interface
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (190108 => 190109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2015-09-22 07:35:27 UTC (rev 190108)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-09-22 08:17:09 UTC (rev 190109)
</span><span class="lines">@@ -1864,7 +1864,20 @@
</span><span class="cx"> if (auto* distributor = shadowRoot->distributor())
</span><span class="cx"> distributor->invalidateDistribution(this);
</span><span class="cx"> #if ENABLE(SHADOW_DOM)
</span><del>- shadowRoot->invalidateSlotAssignments();
</del><ins>+ switch (change.type) {
+ case ElementInserted:
+ case ElementRemoved:
+ case AllChildrenRemoved:
+ shadowRoot->invalidateSlotAssignments();
+ break;
+ case TextInserted:
+ case TextRemoved:
+ case TextChanged:
+ shadowRoot->invalidateDefaultSlotAssignments();
+ break;
+ case NonContentsChildChanged:
+ break;
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (190108 => 190109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2015-09-22 07:35:27 UTC (rev 190108)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2015-09-22 08:17:09 UTC (rev 190109)
</span><span class="lines">@@ -166,9 +166,15 @@
</span><span class="cx"> void ShadowRoot::invalidateSlotAssignments()
</span><span class="cx"> {
</span><span class="cx"> if (m_slotAssignments)
</span><del>- m_slotAssignments->invalidate();
</del><ins>+ m_slotAssignments->invalidate(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void ShadowRoot::invalidateDefaultSlotAssignments()
+{
+ if (m_slotAssignments)
+ m_slotAssignments->invalidateDefaultSlot(*this);
+}
+
</ins><span class="cx"> const Vector<Node*>* ShadowRoot::assignedNodesForSlot(const HTMLSlotElement& slot)
</span><span class="cx"> {
</span><span class="cx"> if (!m_slotAssignments)
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.h (190108 => 190109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.h 2015-09-22 07:35:27 UTC (rev 190108)
+++ trunk/Source/WebCore/dom/ShadowRoot.h 2015-09-22 08:17:09 UTC (rev 190109)
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> void removeSlotElementByName(const AtomicString&, HTMLSlotElement&);
</span><span class="cx">
</span><span class="cx"> void invalidateSlotAssignments();
</span><ins>+ void invalidateDefaultSlotAssignments();
</ins><span class="cx">
</span><span class="cx"> const Vector<Node*>* assignedNodesForSlot(const HTMLSlotElement&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomSlotAssignmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SlotAssignment.cpp (190108 => 190109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SlotAssignment.cpp 2015-09-22 07:35:27 UTC (rev 190108)
+++ trunk/Source/WebCore/dom/SlotAssignment.cpp 2015-09-22 08:17:09 UTC (rev 190109)
</span><span class="lines">@@ -122,6 +122,20 @@
</span><span class="cx"> return &slotInfo.assignedNodes;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SlotAssignment::invalidate(ShadowRoot& shadowRoot)
+{
+ // FIXME: We should be able to do a targeted reconstruction.
+ shadowRoot.host()->setNeedsStyleRecalc(ReconstructRenderTree);
+ m_slotAssignmentsIsValid = false;
+}
+
+void SlotAssignment::invalidateDefaultSlot(ShadowRoot& shadowRoot)
+{
+ auto it = m_slots.find(emptyAtom);
+ if (it != m_slots.end() && it->value->elementCount)
+ invalidate(shadowRoot); // FIXME: We should be able to reconstruct only under the default slot.
+}
+
</ins><span class="cx"> HTMLSlotElement* SlotAssignment::findFirstSlotElement(SlotInfo& slotInfo, ShadowRoot& shadowRoot)
</span><span class="cx"> {
</span><span class="cx"> if (slotInfo.shouldResolveSlotElement())
</span></span></pre></div>
<a id="trunkSourceWebCoredomSlotAssignmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SlotAssignment.h (190108 => 190109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SlotAssignment.h 2015-09-22 07:35:27 UTC (rev 190108)
+++ trunk/Source/WebCore/dom/SlotAssignment.h 2015-09-22 08:17:09 UTC (rev 190109)
</span><span class="lines">@@ -52,7 +52,8 @@
</span><span class="cx">
</span><span class="cx"> const Vector<Node*>* assignedNodesForSlot(const HTMLSlotElement&, ShadowRoot&);
</span><span class="cx">
</span><del>- void invalidate() { m_slotAssignmentsIsValid = false; }
</del><ins>+ void invalidate(ShadowRoot&);
+ void invalidateDefaultSlot(ShadowRoot&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> struct SlotInfo {
</span></span></pre>
</div>
</div>
</body>
</html>