<!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>[190084] 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/190084">190084</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-09-21 15:27:28 -0700 (Mon, 21 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>HTMLSlotElement should render its assigned nodes
https://bugs.webkit.org/show_bug.cgi?id=149242
Reviewed by Ryosuke Niwa.
Source/WebCore:
Support rendering the assigned nodes under HTMLSlotElement.
* dom/SlotAssignment.cpp:
(WebCore::SlotAssignment::assignSlots):
Move the empty slot finding to the loop as the hash table may mutate.
* html/HTMLSlotElement.cpp:
(WebCore::HTMLSlotElement::attributeChanged):
(WebCore::HTMLSlotElement::assignedNodes):
(WebCore::HTMLSlotElement::getDistributedNodes):
* html/HTMLSlotElement.h:
* style/StyleResolveTree.cpp:
(WebCore::Style::attachBeforeOrAfterPseudoElementIfNeeded):
(WebCore::Style::attachSlot):
(WebCore::Style::attachRenderTree):
(WebCore::Style::detachChildren):
(WebCore::Style::detachShadowRoot):
(WebCore::Style::detachSlot):
(WebCore::Style::detachRenderTree):
(WebCore::Style::resolveChildren):
(WebCore::Style::resolveSlot):
(WebCore::Style::resolveTree):
LayoutTests:
Enable the relevant tests.
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkSourceWebCoredomSlotAssignmentcpp">trunk/Source/WebCore/dom/SlotAssignment.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSlotElementcpp">trunk/Source/WebCore/html/HTMLSlotElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSlotElementh">trunk/Source/WebCore/html/HTMLSlotElement.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190083 => 190084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-21 22:08:27 UTC (rev 190083)
+++ trunk/LayoutTests/ChangeLog 2015-09-21 22:27:28 UTC (rev 190084)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-09-21 Antti Koivisto <antti@apple.com>
+
+ HTMLSlotElement should render its assigned nodes
+ https://bugs.webkit.org/show_bug.cgi?id=149242
+
+ Reviewed by Ryosuke Niwa.
+
+ Enable the relevant tests.
+
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2015-09-21 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove Windows-specific navigator-detached-no-crash-expected.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (190083 => 190084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-09-21 22:08:27 UTC (rev 190083)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-09-21 22:27:28 UTC (rev 190084)
</span><span class="lines">@@ -1303,6 +1303,4 @@
</span><span class="cx"> webkit.org/b/149128 fast/text/control-characters [ ImageOnlyFailure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/148695 fast/shadow-dom [ Pass ]
</span><del>-webkit.org/b/149242 fast/shadow-dom/css-scoping-shadow-slot.html [ ImageOnlyFailure ]
-webkit.org/b/149242 fast/shadow-dom/css-scoping-shadow-invisible-slot.html [ ImageOnlyFailure ]
</del><span class="cx"> webkit.org/b/149328 fast/shadow-dom/css-scoping-shadow-with-rules.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190083 => 190084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-21 22:08:27 UTC (rev 190083)
+++ trunk/Source/WebCore/ChangeLog 2015-09-21 22:27:28 UTC (rev 190084)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-09-21 Antti Koivisto <antti@apple.com>
+
+ HTMLSlotElement should render its assigned nodes
+ https://bugs.webkit.org/show_bug.cgi?id=149242
+
+ Reviewed by Ryosuke Niwa.
+
+ Support rendering the assigned nodes under HTMLSlotElement.
+
+ * dom/SlotAssignment.cpp:
+ (WebCore::SlotAssignment::assignSlots):
+
+ Move the empty slot finding to the loop as the hash table may mutate.
+
+ * html/HTMLSlotElement.cpp:
+ (WebCore::HTMLSlotElement::attributeChanged):
+ (WebCore::HTMLSlotElement::assignedNodes):
+ (WebCore::HTMLSlotElement::getDistributedNodes):
+ * html/HTMLSlotElement.h:
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::attachBeforeOrAfterPseudoElementIfNeeded):
+ (WebCore::Style::attachSlot):
+ (WebCore::Style::attachRenderTree):
+ (WebCore::Style::detachChildren):
+ (WebCore::Style::detachShadowRoot):
+ (WebCore::Style::detachSlot):
+ (WebCore::Style::detachRenderTree):
+ (WebCore::Style::resolveChildren):
+ (WebCore::Style::resolveSlot):
+ (WebCore::Style::resolveTree):
+
</ins><span class="cx"> 2015-09-21 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> svg/custom/hidpi-masking-clipping.svg fails with accelerated drawing on
</span></span></pre></div>
<a id="trunkSourceWebCoredomSlotAssignmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SlotAssignment.cpp (190083 => 190084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SlotAssignment.cpp 2015-09-21 22:08:27 UTC (rev 190083)
+++ trunk/Source/WebCore/dom/SlotAssignment.cpp 2015-09-21 22:27:28 UTC (rev 190084)
</span><span class="lines">@@ -175,8 +175,6 @@
</span><span class="cx"> for (auto& entry : m_slots)
</span><span class="cx"> entry.value->assignedNodes.shrink(0);
</span><span class="cx">
</span><del>- auto defaultSlotEntry = m_slots.find(emptyAtom);
-
</del><span class="cx"> for (Node* child = host->firstChild(); child; child = child->nextSibling()) {
</span><span class="cx"> if (is<Element>(child)) {
</span><span class="cx"> auto& slotName = downcast<Element>(*child).fastGetAttribute(slotAttr);
</span><span class="lines">@@ -186,6 +184,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ auto defaultSlotEntry = m_slots.find(emptyAtom);
</ins><span class="cx"> if (defaultSlotEntry != m_slots.end())
</span><span class="cx"> defaultSlotEntry->value->assignedNodes.append(child);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSlotElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSlotElement.cpp (190083 => 190084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSlotElement.cpp 2015-09-21 22:08:27 UTC (rev 190083)
+++ trunk/Source/WebCore/html/HTMLSlotElement.cpp 2015-09-21 22:27:28 UTC (rev 190084)
</span><span class="lines">@@ -85,15 +85,22 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const Vector<Node*>* HTMLSlotElement::assignedNodes() const
+{
+ auto* shadowRoot = containingShadowRoot();
+ if (!shadowRoot)
+ return nullptr;
+
+ return shadowRoot->assignedNodesForSlot(*this);
+}
+
</ins><span class="cx"> Vector<RefPtr<Node>> HTMLSlotElement::getDistributedNodes() const
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<Node>> distributedNodes;
</span><span class="cx">
</span><del>- if (auto shadowRoot = containingShadowRoot()) {
- if (auto assignedNodes = shadowRoot->assignedNodesForSlot(*this)) {
- for (auto* node : *assignedNodes)
- distributedNodes.append(node);
- }
</del><ins>+ if (auto* assignedNodes = this->assignedNodes()) {
+ for (auto* node : *assignedNodes)
+ distributedNodes.append(node);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return distributedNodes;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSlotElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSlotElement.h (190083 => 190084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSlotElement.h 2015-09-21 22:08:27 UTC (rev 190083)
+++ trunk/Source/WebCore/html/HTMLSlotElement.h 2015-09-21 22:27:28 UTC (rev 190084)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLSlotElement> create(const QualifiedName&, Document&);
</span><span class="cx">
</span><ins>+ const Vector<Node*>* assignedNodes() const;
+
</ins><span class="cx"> Vector<RefPtr<Node>> getDistributedNodes() const;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (190083 => 190084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-09-21 22:08:27 UTC (rev 190083)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-09-21 22:27:28 UTC (rev 190084)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "ElementIterator.h"
</span><span class="cx"> #include "ElementRareData.h"
</span><span class="cx"> #include "FlowThreadController.h"
</span><ins>+#include "HTMLSlotElement.h"
</ins><span class="cx"> #include "InsertionPoint.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "LoaderStrategy.h"
</span><span class="lines">@@ -468,11 +469,33 @@
</span><span class="cx"> attachRenderTree(pseudoElement.get(), *current.renderStyle(), renderTreePosition, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM)
+static void attachSlotAssignees(HTMLSlotElement& slot, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition)
+{
+ if (auto* assignedNodes = slot.assignedNodes()) {
+ for (auto* child : *assignedNodes) {
+ if (is<Text>(*child))
+ attachTextRenderer(downcast<Text>(*child), renderTreePosition);
+ else if (is<Element>(*child))
+ attachRenderTree(downcast<Element>(*child), inheritedStyle, renderTreePosition, nullptr);
+ }
+ }
+ slot.clearNeedsStyleRecalc();
+ slot.clearChildNeedsStyleRecalc();
+}
+#endif
+
</ins><span class="cx"> static void attachRenderTree(Element& current, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition, PassRefPtr<RenderStyle> resolvedStyle)
</span><span class="cx"> {
</span><span class="cx"> PostResolutionCallbackDisabler callbackDisabler(current.document());
</span><span class="cx"> WidgetHierarchyUpdatesSuspensionScope suspendWidgetHierarchyUpdates;
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM)
+ if (is<HTMLSlotElement>(current)) {
+ attachSlotAssignees(downcast<HTMLSlotElement>(current), inheritedStyle, renderTreePosition);
+ return;
+ }
+#endif
</ins><span class="cx"> if (is<InsertionPoint>(current)) {
</span><span class="cx"> attachDistributedChildren(downcast<InsertionPoint>(current), inheritedStyle, renderTreePosition);
</span><span class="cx"> current.clearNeedsStyleRecalc();
</span><span class="lines">@@ -532,15 +555,10 @@
</span><span class="cx">
</span><span class="cx"> static void detachChildren(ContainerNode& current, DetachType detachType)
</span><span class="cx"> {
</span><del>- if (is<InsertionPoint>(current))
- detachDistributedChildren(downcast<InsertionPoint>(current));
-
</del><span class="cx"> for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
</span><del>- if (is<Text>(*child)) {
- Style::detachTextRenderer(downcast<Text>(*child));
- continue;
- }
- if (is<Element>(*child))
</del><ins>+ if (is<Text>(*child))
+ detachTextRenderer(downcast<Text>(*child));
+ else if (is<Element>(*child))
</ins><span class="cx"> detachRenderTree(downcast<Element>(*child), detachType);
</span><span class="cx"> }
</span><span class="cx"> current.clearChildNeedsStyleRecalc();
</span><span class="lines">@@ -551,6 +569,23 @@
</span><span class="cx"> detachChildren(shadowRoot, detachType);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM)
+static void detachSlotAssignees(HTMLSlotElement& slot, DetachType detachType)
+{
+ ASSERT(!slot.renderer());
+ if (auto* assignedNodes = slot.assignedNodes()) {
+ for (auto* child : *assignedNodes) {
+ if (is<Text>(*child))
+ detachTextRenderer(downcast<Text>(*child));
+ else if (is<Element>(*child))
+ detachRenderTree(downcast<Element>(*child), detachType);
+ }
+ }
+ slot.clearNeedsStyleRecalc();
+ slot.clearChildNeedsStyleRecalc();
+}
+#endif
+
</ins><span class="cx"> static void detachRenderTree(Element& current, DetachType detachType)
</span><span class="cx"> {
</span><span class="cx"> WidgetHierarchyUpdatesSuspensionScope suspendWidgetHierarchyUpdates;
</span><span class="lines">@@ -565,7 +600,13 @@
</span><span class="cx"> if (detachType != ReattachDetach)
</span><span class="cx"> current.clearHoverAndActiveStatusBeforeDetachingRenderer();
</span><span class="cx">
</span><del>- if (ShadowRoot* shadowRoot = current.shadowRoot())
</del><ins>+ if (is<InsertionPoint>(current))
+ detachDistributedChildren(downcast<InsertionPoint>(current));
+#if ENABLE(SHADOW_DOM)
+ else if (is<HTMLSlotElement>(current))
+ detachSlotAssignees(downcast<HTMLSlotElement>(current), detachType);
+#endif
+ else if (ShadowRoot* shadowRoot = current.shadowRoot())
</ins><span class="cx"> detachShadowRoot(*shadowRoot, detachType);
</span><span class="cx">
</span><span class="cx"> detachChildren(current, detachType);
</span><span class="lines">@@ -798,10 +839,32 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM)
+static void resolveSlotAssignees(HTMLSlotElement& slot, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition, Change change)
+{
+ if (auto* assignedNodes = slot.assignedNodes()) {
+ for (auto* child : *assignedNodes) {
+ if (is<Text>(*child))
+ resolveTextNode(downcast<Text>(*child), renderTreePosition);
+ else if (is<Element>(*child))
+ resolveTree(downcast<Element>(*child), inheritedStyle, renderTreePosition, change);
+ }
+ }
+ slot.clearNeedsStyleRecalc();
+ slot.clearChildNeedsStyleRecalc();
+}
+#endif
+
</ins><span class="cx"> void resolveTree(Element& current, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition, Change change)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(change != Detach);
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM)
+ if (is<HTMLSlotElement>(current)) {
+ resolveSlotAssignees(downcast<HTMLSlotElement>(current), inheritedStyle, renderTreePosition, change);
+ return;
+ }
+#endif
</ins><span class="cx"> if (is<InsertionPoint>(current)) {
</span><span class="cx"> current.clearNeedsStyleRecalc();
</span><span class="cx"> current.clearChildNeedsStyleRecalc();
</span></span></pre>
</div>
</div>
</body>
</html>