<!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>[190840] 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/190840">190840</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-10-10 11:16:37 -0700 (Sat, 10 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rewrite HTMLDetailsElement using HTMLSlotElement
https://bugs.webkit.org/show_bug.cgi?id=149698
Reviewed by Andreas Kling.
Source/WebCore:
Use the modern Shadow DOM to implement <details> element. After this the legacy InsertionPoint and
related code can be removed.
Based on a patch by Ryosuke.
* dom/Element.cpp:
(WebCore::Element::childrenChanged):
* dom/EventDispatcher.cpp:
(WebCore::EventPath::EventPath):
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::ShadowRoot):
(WebCore::ShadowRoot::~ShadowRoot):
(WebCore::ShadowRoot::removeAllEventListeners):
(WebCore::ShadowRoot::findAssignedSlot):
(WebCore::ShadowRoot::addSlotElementByName):
(WebCore::ShadowRoot::removeSlotElementByName):
(WebCore::ShadowRoot::invalidateSlotAssignments):
(WebCore::ShadowRoot::invalidateDefaultSlotAssignments):
(WebCore::ShadowRoot::assignedNodesForSlot):
* dom/ShadowRoot.h:
(WebCore::ShadowRoot::create):
(WebCore::ShadowRoot::distributor):
(WebCore::ShadowRoot::isOrphan):
* dom/SlotAssignment.cpp:
(WebCore::slotNameFromAttributeValue):
Rename for clarity.
(WebCore::slotNameFromSlotAttribute):
SlotAssignment can now be specialized by providing function that maps from node to slot name.
This is the default function that gets the name from the slot attribute.
(WebCore::SlotAssignment::SlotAssignment):
(WebCore::SlotAssignment::findAssignedSlot):
Use the name mapping function.
Ensure that the slots are assigned.
(WebCore::SlotAssignment::addSlotElementByName):
(WebCore::SlotAssignment::removeSlotElementByName):
(WebCore::SlotAssignment::assignedNodesForSlot):
(WebCore::SlotAssignment::invalidate):
(WebCore::SlotAssignment::invalidateDefaultSlot):
(WebCore::SlotAssignment::resolveAllSlotElements):
(WebCore::SlotAssignment::assignSlots):
Use the name mapping function.
(WebCore::SlotAssignment::assignToSlot):
Factor into function.
(WebCore::treatNullAsEmpty): Deleted.
* dom/SlotAssignment.h:
(WebCore::SlotAssignment::~SlotAssignment):
(WebCore::SlotAssignment::defaultSlotName):
Add static getter for emptyAtom for clarity.
(WebCore::SlotAssignment::SlotAssignment): Deleted.
* html/HTMLDetailsElement.cpp:
(WebCore::summarySlotName):
(WebCore::slotNameFunction):
Slot name function for <details>. It assigns the first <summary> child to the summary slot and others
to the default content slot if the element is open.
(WebCore::HTMLDetailsElement::create):
(WebCore::HTMLDetailsElement::didAddUserAgentShadowRoot):
(WebCore::HTMLDetailsElement::isActiveSummary):
(WebCore::HTMLDetailsElement::parseAttribute):
(WebCore::HTMLDetailsElement::toggleOpen):
(WebCore::summaryQuerySelector): Deleted.
(WebCore::DetailsContentElement::create): Deleted.
(WebCore::DetailsSummaryElement::create): Deleted.
(WebCore::HTMLDetailsElement::findMainSummary): Deleted.
(WebCore::HTMLDetailsElement::childShouldCreateRenderer): Deleted.
* html/HTMLDetailsElement.h:
* html/HTMLSummaryElement.cpp:
(WebCore::HTMLSummaryElement::create):
(WebCore::HTMLSummaryElement::createElementRenderer):
(WebCore::HTMLSummaryElement::didAddUserAgentShadowRoot):
(WebCore::HTMLSummaryElement::detailsElement):
(WebCore::HTMLSummaryElement::isActiveSummary):
(WebCore::isClickableControl):
(WebCore::HTMLSummaryElement::supportsFocus):
(WebCore::HTMLSummaryElement::defaultEventHandler):
(WebCore::HTMLSummaryElement::willRespondToMouseClickEvents):
(WebCore::SummaryContentElement::create): Deleted.
(WebCore::HTMLSummaryElement::childShouldCreateRenderer): Deleted.
(WebCore::HTMLSummaryElement::isMainSummary): Deleted.
* html/HTMLSummaryElement.h:
* html/shadow/DetailsMarkerControl.cpp:
(WebCore::DetailsMarkerControl::rendererIsNeeded):
* style/RenderTreePosition.cpp:
(WebCore::RenderTreePosition::computeNextSibling):
Skip the verification assert for shadow host children. Getting this right requires
better shadow-aware traversal code.
* style/StyleResolveTree.cpp:
(WebCore::Style::invalidateWhitespaceOnlyTextSiblingsAfterAttachIfNeeded):
(WebCore::Style::attachChildren):
(WebCore::Style::attachShadowRoot):
(WebCore::Style::attachBeforeOrAfterPseudoElementIfNeeded):
(WebCore::Style::attachSlotAssignees):
(WebCore::Style::attachRenderTree):
(WebCore::Style::detachChildren):
(WebCore::Style::detachShadowRoot):
(WebCore::Style::detachSlotAssignees):
(WebCore::Style::detachRenderTree):
(WebCore::Style::resolveChildren):
(WebCore::Style::resolveSlotAssignees):
(WebCore::Style::resolveTree):
(WebCore::Style::attachDistributedChildren): Deleted.
(WebCore::Style::detachDistributedChildren): Deleted.
Remove InsertionPoint related code paths.
LayoutTests:
* TestExpectations:
* platform/mac/fast/html/details-add-child-2-expected.txt:
* platform/mac/fast/html/details-open2-expected.txt:
* platform/mac/fast/html/details-remove-summary-1-and-click-expected.txt:
* platform/mac/fast/html/details-remove-summary-4-and-click-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssgeneratedcontentdetailssummarybeforeafterexpectedtxt">trunk/LayoutTests/platform/mac/fast/css-generated-content/details-summary-before-after-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasthtmldetailsaddchild2expectedtxt">trunk/LayoutTests/platform/mac/fast/html/details-add-child-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasthtmldetailsopen2expectedtxt">trunk/LayoutTests/platform/mac/fast/html/details-open2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasthtmldetailsremovesummary1andclickexpectedtxt">trunk/LayoutTests/platform/mac/fast/html/details-remove-summary-1-and-click-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasthtmldetailsremovesummary4andclickexpectedtxt">trunk/LayoutTests/platform/mac/fast/html/details-remove-summary-4-and-click-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksfasthtmldetailsopen2expectedtxt">trunk/LayoutTests/platform/mac-mavericks/fast/html/details-open2-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoredomDOMAllInOnecpp">trunk/Source/WebCore/dom/DOMAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomEventDispatchercpp">trunk/Source/WebCore/dom/EventDispatcher.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>
<li><a href="#trunkSourceWebCorehtmlHTMLDetailsElementcpp">trunk/Source/WebCore/html/HTMLDetailsElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLDetailsElementh">trunk/Source/WebCore/html/HTMLDetailsElement.h</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="#trunkSourceWebCorehtmlHTMLSummaryElementcpp">trunk/Source/WebCore/html/HTMLSummaryElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSummaryElementh">trunk/Source/WebCore/html/HTMLSummaryElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowDetailsMarkerControlcpp">trunk/Source/WebCore/html/shadow/DetailsMarkerControl.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreePositioncpp">trunk/Source/WebCore/style/RenderTreePosition.cpp</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 (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/LayoutTests/ChangeLog 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-10 Antti Koivisto <antti@apple.com>
+
+ Rewrite HTMLDetailsElement using HTMLSlotElement
+ https://bugs.webkit.org/show_bug.cgi?id=149698
+
+ Reviewed by Andreas Kling.
+
+ * TestExpectations:
+ * platform/mac/fast/html/details-add-child-2-expected.txt:
+ * platform/mac/fast/html/details-open2-expected.txt:
+ * platform/mac/fast/html/details-remove-summary-1-and-click-expected.txt:
+ * platform/mac/fast/html/details-remove-summary-4-and-click-expected.txt:
+
</ins><span class="cx"> 2015-10-10 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> SerializedScriptValue should use a compact encoding for 8-bit strings.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/LayoutTests/TestExpectations 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -672,6 +672,7 @@
</span><span class="cx"> webkit.org/b/149082 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-overridesexpires.html [ Pass Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/148695 fast/shadow-dom [ Failure ImageOnlyFailure ]
</span><ins>+webkit.org/b/149997 fast/html/details-replace-text.html [ Failure ]
</ins><span class="cx">
</span><span class="cx"> # Marks as flaky (see also https://bugs.webkit.org/show_bug.cgi?id=132388)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssgeneratedcontentdetailssummarybeforeafterexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css-generated-content/details-summary-before-after-expected.txt (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css-generated-content/details-summary-before-after-expected.txt 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/LayoutTests/platform/mac/fast/css-generated-content/details-summary-before-after-expected.txt 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> RenderText at (0,0) size 30x18
</span><span class="cx"> text run at (0,0) width 30: "after"
</span><span class="cx"> RenderBlock (anonymous) at (1,77) size 782x18
</span><ins>+ RenderText {#text} at (0,0) size 0x0
</ins><span class="cx"> RenderText {#text} at (0,0) size 50x18
</span><span class="cx"> text run at (0,0) width 50: "Details "
</span><span class="cx"> RenderInline (generated) at (0,0) size 30x18
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasthtmldetailsaddchild2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/html/details-add-child-2-expected.txt (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/html/details-add-child-2-expected.txt 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/LayoutTests/platform/mac/fast/html/details-add-child-2-expected.txt 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -12,5 +12,3 @@
</span><span class="cx"> RenderInline {B} at (0,0) size 144x18
</span><span class="cx"> RenderText {#text} at (0,0) size 144x18
</span><span class="cx"> text run at (0,0) width 144: "should have bold test"
</span><del>- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasthtmldetailsopen2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/html/details-open2-expected.txt (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/html/details-open2-expected.txt 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/LayoutTests/platform/mac/fast/html/details-open2-expected.txt 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -10,7 +10,5 @@
</span><span class="cx"> text run at (16,0) width 61: "summary"
</span><span class="cx"> RenderBlock (anonymous) at (0,18) size 784x23
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><del>- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
</del><span class="cx"> layer at (13,31) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasthtmldetailsremovesummary1andclickexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/html/details-remove-summary-1-and-click-expected.txt (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/html/details-remove-summary-1-and-click-expected.txt 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/LayoutTests/platform/mac/fast/html/details-remove-summary-1-and-click-expected.txt 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> RenderDetailsMarker {DIV} at (0,4) size 11x11: down
</span><span class="cx"> RenderText {#text} at (16,0) size 47x18
</span><span class="cx"> text run at (16,0) width 47: "Details"
</span><del>-caret: position 0 of child 0 {DIV} of {#document-fragment} of child 0 {SUMMARY} of child 0 {WEBKITSHADOWCONTENT} of {#document-fragment} of child 1 {DETAILS} of body
</del><ins>+caret: position 0 of child 0 {DIV} of {#document-fragment} of child 0 {SUMMARY} of child 0 {SLOT} of {#document-fragment} of child 1 {DETAILS} of body
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasthtmldetailsremovesummary4andclickexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/html/details-remove-summary-4-and-click-expected.txt (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/html/details-remove-summary-4-and-click-expected.txt 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/LayoutTests/platform/mac/fast/html/details-remove-summary-4-and-click-expected.txt 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> RenderDetailsMarker {DIV} at (0,4) size 11x11: right
</span><span class="cx"> RenderText {#text} at (16,0) size 47x18
</span><span class="cx"> text run at (16,0) width 47: "Details"
</span><del>-caret: position 0 of child 0 {DIV} of {#document-fragment} of child 0 {SUMMARY} of child 0 {WEBKITSHADOWCONTENT} of {#document-fragment} of child 1 {DETAILS} of body
</del><ins>+caret: position 0 of child 0 {DIV} of {#document-fragment} of child 0 {SUMMARY} of child 0 {SLOT} of {#document-fragment} of child 1 {DETAILS} of body
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksfasthtmldetailsopen2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/fast/html/details-open2-expected.txt (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/fast/html/details-open2-expected.txt 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/LayoutTests/platform/mac-mavericks/fast/html/details-open2-expected.txt 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -10,7 +10,5 @@
</span><span class="cx"> text run at (16,0) width 61: "summary"
</span><span class="cx"> RenderBlock (anonymous) at (0,18) size 784x23
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><del>- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
</del><span class="cx"> layer at (13,31) size 139x13
</span><span class="cx"> RenderBlock {DIV} at (3,3) size 140x13
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -1500,6 +1500,7 @@
</span><span class="cx"> dom/SecurityOriginPolicy.cpp
</span><span class="cx"> dom/SelectorQuery.cpp
</span><span class="cx"> dom/ShadowRoot.cpp
</span><ins>+ dom/SlotAssignment.cpp
</ins><span class="cx"> dom/SpaceSplitString.cpp
</span><span class="cx"> dom/StaticNodeList.cpp
</span><span class="cx"> dom/StringCallback.cpp
</span><span class="lines">@@ -1700,6 +1701,7 @@
</span><span class="cx"> html/HTMLQuoteElement.cpp
</span><span class="cx"> html/HTMLScriptElement.cpp
</span><span class="cx"> html/HTMLSelectElement.cpp
</span><ins>+ html/HTMLSlotElement.cpp
</ins><span class="cx"> html/HTMLSourceElement.cpp
</span><span class="cx"> html/HTMLSpanElement.cpp
</span><span class="cx"> html/HTMLStyleElement.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/ChangeLog 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -1,3 +1,130 @@
</span><ins>+2015-10-10 Antti Koivisto <antti@apple.com>
+
+ Rewrite HTMLDetailsElement using HTMLSlotElement
+ https://bugs.webkit.org/show_bug.cgi?id=149698
+
+ Reviewed by Andreas Kling.
+
+ Use the modern Shadow DOM to implement <details> element. After this the legacy InsertionPoint and
+ related code can be removed.
+
+ Based on a patch by Ryosuke.
+
+ * dom/Element.cpp:
+ (WebCore::Element::childrenChanged):
+ * dom/EventDispatcher.cpp:
+ (WebCore::EventPath::EventPath):
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::ShadowRoot):
+ (WebCore::ShadowRoot::~ShadowRoot):
+ (WebCore::ShadowRoot::removeAllEventListeners):
+ (WebCore::ShadowRoot::findAssignedSlot):
+ (WebCore::ShadowRoot::addSlotElementByName):
+ (WebCore::ShadowRoot::removeSlotElementByName):
+ (WebCore::ShadowRoot::invalidateSlotAssignments):
+ (WebCore::ShadowRoot::invalidateDefaultSlotAssignments):
+ (WebCore::ShadowRoot::assignedNodesForSlot):
+ * dom/ShadowRoot.h:
+ (WebCore::ShadowRoot::create):
+ (WebCore::ShadowRoot::distributor):
+ (WebCore::ShadowRoot::isOrphan):
+ * dom/SlotAssignment.cpp:
+ (WebCore::slotNameFromAttributeValue):
+
+ Rename for clarity.
+
+ (WebCore::slotNameFromSlotAttribute):
+
+ SlotAssignment can now be specialized by providing function that maps from node to slot name.
+ This is the default function that gets the name from the slot attribute.
+
+ (WebCore::SlotAssignment::SlotAssignment):
+ (WebCore::SlotAssignment::findAssignedSlot):
+
+ Use the name mapping function.
+ Ensure that the slots are assigned.
+
+ (WebCore::SlotAssignment::addSlotElementByName):
+ (WebCore::SlotAssignment::removeSlotElementByName):
+ (WebCore::SlotAssignment::assignedNodesForSlot):
+ (WebCore::SlotAssignment::invalidate):
+ (WebCore::SlotAssignment::invalidateDefaultSlot):
+ (WebCore::SlotAssignment::resolveAllSlotElements):
+ (WebCore::SlotAssignment::assignSlots):
+
+ Use the name mapping function.
+
+ (WebCore::SlotAssignment::assignToSlot):
+
+ Factor into function.
+
+ (WebCore::treatNullAsEmpty): Deleted.
+ * dom/SlotAssignment.h:
+ (WebCore::SlotAssignment::~SlotAssignment):
+ (WebCore::SlotAssignment::defaultSlotName):
+
+ Add static getter for emptyAtom for clarity.
+
+ (WebCore::SlotAssignment::SlotAssignment): Deleted.
+ * html/HTMLDetailsElement.cpp:
+ (WebCore::summarySlotName):
+ (WebCore::slotNameFunction):
+
+ Slot name function for <details>. It assigns the first <summary> child to the summary slot and others
+ to the default content slot if the element is open.
+
+ (WebCore::HTMLDetailsElement::create):
+ (WebCore::HTMLDetailsElement::didAddUserAgentShadowRoot):
+ (WebCore::HTMLDetailsElement::isActiveSummary):
+ (WebCore::HTMLDetailsElement::parseAttribute):
+ (WebCore::HTMLDetailsElement::toggleOpen):
+ (WebCore::summaryQuerySelector): Deleted.
+ (WebCore::DetailsContentElement::create): Deleted.
+ (WebCore::DetailsSummaryElement::create): Deleted.
+ (WebCore::HTMLDetailsElement::findMainSummary): Deleted.
+ (WebCore::HTMLDetailsElement::childShouldCreateRenderer): Deleted.
+ * html/HTMLDetailsElement.h:
+ * html/HTMLSummaryElement.cpp:
+ (WebCore::HTMLSummaryElement::create):
+ (WebCore::HTMLSummaryElement::createElementRenderer):
+ (WebCore::HTMLSummaryElement::didAddUserAgentShadowRoot):
+ (WebCore::HTMLSummaryElement::detailsElement):
+ (WebCore::HTMLSummaryElement::isActiveSummary):
+ (WebCore::isClickableControl):
+ (WebCore::HTMLSummaryElement::supportsFocus):
+ (WebCore::HTMLSummaryElement::defaultEventHandler):
+ (WebCore::HTMLSummaryElement::willRespondToMouseClickEvents):
+ (WebCore::SummaryContentElement::create): Deleted.
+ (WebCore::HTMLSummaryElement::childShouldCreateRenderer): Deleted.
+ (WebCore::HTMLSummaryElement::isMainSummary): Deleted.
+ * html/HTMLSummaryElement.h:
+ * html/shadow/DetailsMarkerControl.cpp:
+ (WebCore::DetailsMarkerControl::rendererIsNeeded):
+ * style/RenderTreePosition.cpp:
+ (WebCore::RenderTreePosition::computeNextSibling):
+
+ Skip the verification assert for shadow host children. Getting this right requires
+ better shadow-aware traversal code.
+
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::invalidateWhitespaceOnlyTextSiblingsAfterAttachIfNeeded):
+ (WebCore::Style::attachChildren):
+ (WebCore::Style::attachShadowRoot):
+ (WebCore::Style::attachBeforeOrAfterPseudoElementIfNeeded):
+ (WebCore::Style::attachSlotAssignees):
+ (WebCore::Style::attachRenderTree):
+ (WebCore::Style::detachChildren):
+ (WebCore::Style::detachShadowRoot):
+ (WebCore::Style::detachSlotAssignees):
+ (WebCore::Style::detachRenderTree):
+ (WebCore::Style::resolveChildren):
+ (WebCore::Style::resolveSlotAssignees):
+ (WebCore::Style::resolveTree):
+ (WebCore::Style::attachDistributedChildren): Deleted.
+ (WebCore::Style::detachDistributedChildren): Deleted.
+
+ Remove InsertionPoint related code paths.
+
</ins><span class="cx"> 2015-10-10 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> SerializedScriptValue should use a compact encoding for 8-bit strings.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -14912,6 +14912,20 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\dom\SlotAssignment.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\dom\SpaceSplitString.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -22049,6 +22063,7 @@
</span><span class="cx"> <ClInclude Include="..\dom\SecurityContext.h" />
</span><span class="cx"> <ClInclude Include="..\dom\SecurityOriginPolicy.h" />
</span><span class="cx"> <ClInclude Include="..\dom\SelectorQuery.h" />
</span><ins>+ <ClInclude Include="..\dom\SlotAssignment.h" />
</ins><span class="cx"> <ClInclude Include="..\dom\SimulatedClickOptions.h" />
</span><span class="cx"> <ClInclude Include="..\dom\SpaceSplitString.h" />
</span><span class="cx"> <ClInclude Include="..\dom\StaticHashSetNodeList.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMAllInOne.cpp (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMAllInOne.cpp 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/dom/DOMAllInOne.cpp 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx"> #include "SecurityOriginPolicy.cpp"
</span><span class="cx"> #include "SelectorQuery.cpp"
</span><span class="cx"> #include "ShadowRoot.cpp"
</span><ins>+#include "SlotAssignment.cpp"
</ins><span class="cx"> #include "SpaceSplitString.cpp"
</span><span class="cx"> #include "StaticNodeList.cpp"
</span><span class="cx"> #include "StringCallback.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -1860,9 +1860,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (ShadowRoot* shadowRoot = this->shadowRoot()) {
</span><del>- if (auto* distributor = shadowRoot->distributor())
- distributor->invalidateDistribution(this);
-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx"> switch (change.type) {
</span><span class="cx"> case ElementInserted:
</span><span class="cx"> case ElementRemoved:
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventDispatcher.cpp (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventDispatcher.cpp 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/dom/EventDispatcher.cpp 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "HTMLInputElement.h"
</span><span class="cx"> #include "HTMLMediaElement.h"
</span><span class="cx"> #include "HTMLSlotElement.h"
</span><del>-#include "InsertionPoint.h"
</del><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "MouseEvent.h"
</span><span class="cx"> #include "PseudoElement.h"
</span><span class="lines">@@ -403,7 +402,7 @@
</span><span class="cx"> EventPath::EventPath(Node& originalTarget, Event& event)
</span><span class="cx"> : m_event(event)
</span><span class="cx"> {
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx"> Vector<EventTarget*, 16> targetStack;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -433,7 +432,7 @@
</span><span class="cx"> parent = node->parentNode();
</span><span class="cx"> if (!parent)
</span><span class="cx"> return;
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx"> if (ShadowRoot* shadowRootOfParent = parent->shadowRoot()) {
</span><span class="cx"> if (auto* assignedSlot = shadowRootOfParent->findAssignedSlot(*node)) {
</span><span class="cx"> // node is assigned to a slot. Continue dispatching the event at this slot.
</span><span class="lines">@@ -448,7 +447,7 @@
</span><span class="cx">
</span><span class="cx"> ShadowRoot& shadowRoot = downcast<ShadowRoot>(*node);
</span><span class="cx"> // At a shadow root. Continue dispatching the event at the shadow host.
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx"> if (!targetStack.isEmpty()) {
</span><span class="cx"> // Move target back to a descendant of the shadow host if the event did not originate in this shadow tree or its inner shadow trees.
</span><span class="cx"> target = targetStack.last();
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "AuthorStyleSheets.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "ElementTraversal.h"
</span><del>-#include "InsertionPoint.h"
</del><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx"> #include "SlotAssignment.h"
</span><span class="lines">@@ -45,7 +44,7 @@
</span><span class="cx"> void* styleResolver;
</span><span class="cx"> void* authorStyleSheets;
</span><span class="cx"> void* host;
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx"> void* slotAssignment;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="lines">@@ -55,12 +54,22 @@
</span><span class="cx"> ShadowRoot::ShadowRoot(Document& document, Type type)
</span><span class="cx"> : DocumentFragment(document, CreateShadowRoot)
</span><span class="cx"> , TreeScope(*this, document)
</span><del>- , m_resetStyleInheritance(false)
</del><span class="cx"> , m_type(type)
</span><del>- , m_host(nullptr)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+
+ShadowRoot::ShadowRoot(Document& document, std::unique_ptr<SlotAssignment>&& slotAssignment)
+ : DocumentFragment(document, CreateShadowRoot)
+ , TreeScope(*this, document)
+ , m_type(Type::UserAgent)
+ , m_slotAssignment(WTF::move(slotAssignment))
+{
+}
+
+#endif
+
</ins><span class="cx"> ShadowRoot::~ShadowRoot()
</span><span class="cx"> {
</span><span class="cx"> // We cannot let ContainerNode destructor call willBeDeletedFrom()
</span><span class="lines">@@ -175,45 +184,45 @@
</span><span class="cx"> node->removeAllEventListeners();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx">
</span><span class="cx"> HTMLSlotElement* ShadowRoot::findAssignedSlot(const Node& node)
</span><span class="cx"> {
</span><del>- if (!m_slotAssignments)
</del><ins>+ if (!m_slotAssignment)
</ins><span class="cx"> return nullptr;
</span><del>- return m_slotAssignments->findAssignedSlot(node, *this);
</del><ins>+ return m_slotAssignment->findAssignedSlot(node, *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ShadowRoot::addSlotElementByName(const AtomicString& name, HTMLSlotElement& slot)
</span><span class="cx"> {
</span><del>- if (!m_slotAssignments)
- m_slotAssignments = std::make_unique<SlotAssignment>();
</del><ins>+ if (!m_slotAssignment)
+ m_slotAssignment = std::make_unique<SlotAssignment>();
</ins><span class="cx">
</span><del>- return m_slotAssignments->addSlotElementByName(name, slot, *this);
</del><ins>+ return m_slotAssignment->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, *this);
</del><ins>+ return m_slotAssignment->removeSlotElementByName(name, slot, *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ShadowRoot::invalidateSlotAssignments()
</span><span class="cx"> {
</span><del>- if (m_slotAssignments)
- m_slotAssignments->invalidate(*this);
</del><ins>+ if (m_slotAssignment)
+ m_slotAssignment->invalidate(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ShadowRoot::invalidateDefaultSlotAssignments()
</span><span class="cx"> {
</span><del>- if (m_slotAssignments)
- m_slotAssignments->invalidateDefaultSlot(*this);
</del><ins>+ if (m_slotAssignment)
+ m_slotAssignment->invalidateDefaultSlot(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const Vector<Node*>* ShadowRoot::assignedNodesForSlot(const HTMLSlotElement& slot)
</span><span class="cx"> {
</span><del>- if (!m_slotAssignments)
</del><ins>+ if (!m_slotAssignment)
</ins><span class="cx"> return nullptr;
</span><del>- return m_slotAssignments->assignedNodesForSlot(slot, *this);
</del><ins>+ return m_slotAssignment->assignedNodesForSlot(slot, *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.h (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.h 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/dom/ShadowRoot.h 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -54,6 +54,13 @@
</span><span class="cx"> return adoptRef(*new ShadowRoot(document, type));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ static Ref<ShadowRoot> create(Document& document, std::unique_ptr<SlotAssignment>&& assignment)
+ {
+ return adoptRef(*new ShadowRoot(document, WTF::move(assignment)));
+ }
+#endif
+
</ins><span class="cx"> virtual ~ShadowRoot();
</span><span class="cx">
</span><span class="cx"> StyleResolver& styleResolver();
</span><span class="lines">@@ -81,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ContentDistributor* distributor() { return nullptr; }
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx"> HTMLSlotElement* findAssignedSlot(const Node&);
</span><span class="cx">
</span><span class="cx"> void addSlotElementByName(const AtomicString&, HTMLSlotElement&);
</span><span class="lines">@@ -96,6 +103,10 @@
</span><span class="cx"> protected:
</span><span class="cx"> ShadowRoot(Document&, Type);
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ ShadowRoot(Document&, std::unique_ptr<SlotAssignment>&&);
+#endif
+
</ins><span class="cx"> // FIXME: This shouldn't happen. https://bugs.webkit.org/show_bug.cgi?id=88834
</span><span class="cx"> bool isOrphan() const { return !m_host; }
</span><span class="cx">
</span><span class="lines">@@ -104,16 +115,16 @@
</span><span class="cx">
</span><span class="cx"> virtual Ref<Node> cloneNodeInternal(Document&, CloningOperation) override;
</span><span class="cx">
</span><del>- bool m_resetStyleInheritance;
- Type m_type;
</del><ins>+ bool m_resetStyleInheritance { false };
+ Type m_type { Type::UserAgent };
</ins><span class="cx">
</span><del>- Element* m_host;
</del><ins>+ Element* m_host { nullptr };
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<StyleResolver> m_styleResolver;
</span><span class="cx"> std::unique_ptr<AuthorStyleSheets> m_authorStyleSheets;
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
- std::unique_ptr<SlotAssignment> m_slotAssignments;
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ std::unique_ptr<SlotAssignment> m_slotAssignment;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomSlotAssignmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SlotAssignment.cpp (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SlotAssignment.cpp 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/dom/SlotAssignment.cpp 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -26,25 +26,48 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SlotAssignment.h"
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx">
</span><span class="cx"> #include "HTMLSlotElement.h"
</span><ins>+#include "ShadowRoot.h"
</ins><span class="cx"> #include "TypedElementDescendantIterator.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-static const AtomicString& treatNullAsEmpty(const AtomicString& name)
</del><ins>+static const AtomicString& slotNameFromAttributeValue(const AtomicString& value)
</ins><span class="cx"> {
</span><del>- return name == nullAtom ? emptyAtom : name;
</del><ins>+ return value == nullAtom ? SlotAssignment::defaultSlotName() : value;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static const AtomicString& slotNameFromSlotAttribute(const Node& child)
+{
+ if (!is<Element>(child))
+ return SlotAssignment::defaultSlotName();
+ return slotNameFromAttributeValue(downcast<Element>(child).fastGetAttribute(slotAttr));
+}
+
+SlotAssignment::SlotAssignment()
+ : m_slotNameFunction(slotNameFromSlotAttribute)
+{
+}
+
+SlotAssignment::SlotAssignment(SlotNameFunction function)
+ : m_slotNameFunction(WTF::move(function))
+{
+}
+
</ins><span class="cx"> HTMLSlotElement* SlotAssignment::findAssignedSlot(const Node& node, ShadowRoot& shadowRoot)
</span><span class="cx"> {
</span><del>- const AtomicString& name = is<Element>(node) ? downcast<Element>(node).fastGetAttribute(slotAttr) : emptyAtom;
</del><ins>+ if (!m_slotAssignmentsIsValid)
+ assignSlots(shadowRoot);
</ins><span class="cx">
</span><del>- auto it = m_slots.find(treatNullAsEmpty(name));
</del><ins>+ auto slotName = m_slotNameFunction(node);
+ if (!slotName)
+ return nullptr;
+
+ auto it = m_slots.find(slotName);
</ins><span class="cx"> if (it == m_slots.end())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -61,11 +84,11 @@
</span><span class="cx"> // FIXME: We should be able to do a targeted reconstruction.
</span><span class="cx"> shadowRoot.host()->setNeedsStyleRecalc(ReconstructRenderTree);
</span><span class="cx">
</span><del>- const AtomicString& key = treatNullAsEmpty(name);
- auto addResult = m_slots.add(key, std::unique_ptr<SlotInfo>());
</del><ins>+ const AtomicString& slotName = slotNameFromAttributeValue(name);
+ auto addResult = m_slots.add(slotName, std::unique_ptr<SlotInfo>());
</ins><span class="cx"> if (addResult.isNewEntry) {
</span><span class="cx"> addResult.iterator->value = std::make_unique<SlotInfo>(slotElement);
</span><del>- if (key == emptyAtom) // Because assignSlots doesn't collect nodes assgined to the default slot as an optimzation.
</del><ins>+ if (slotName == defaultSlotName()) // Because assignSlots doesn't collect nodes assigned to the default slot as an optimzation.
</ins><span class="cx"> m_slotAssignmentsIsValid = false;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -93,7 +116,7 @@
</span><span class="cx"> if (auto* host = shadowRoot.host()) // FIXME: We should be able to do a targeted reconstruction.
</span><span class="cx"> host->setNeedsStyleRecalc(ReconstructRenderTree);
</span><span class="cx">
</span><del>- auto it = m_slots.find(treatNullAsEmpty(name));
</del><ins>+ auto it = m_slots.find(slotNameFromAttributeValue(name));
</ins><span class="cx"> RELEASE_ASSERT(it != m_slots.end());
</span><span class="cx">
</span><span class="cx"> auto& slotInfo = *it->value;
</span><span class="lines">@@ -114,8 +137,8 @@
</span><span class="cx"> if (!m_slotAssignmentsIsValid)
</span><span class="cx"> assignSlots(shadowRoot);
</span><span class="cx">
</span><del>- const AtomicString& slotName = slotElement.fastGetAttribute(nameAttr);
- auto it = m_slots.find(treatNullAsEmpty(slotName));
</del><ins>+ const AtomicString& slotName = slotNameFromAttributeValue(slotElement.fastGetAttribute(nameAttr));
+ auto it = m_slots.find(slotName);
</ins><span class="cx"> if (it == m_slots.end())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -140,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> void SlotAssignment::invalidateDefaultSlot(ShadowRoot& shadowRoot)
</span><span class="cx"> {
</span><del>- auto it = m_slots.find(emptyAtom);
</del><ins>+ auto it = m_slots.find(defaultSlotName());
</ins><span class="cx"> if (it != m_slots.end() && it->value->elementCount)
</span><span class="cx"> invalidate(shadowRoot); // FIXME: We should be able to reconstruct only under the default slot.
</span><span class="cx"> }
</span><span class="lines">@@ -170,9 +193,9 @@
</span><span class="cx">
</span><span class="cx"> unsigned slotCount = m_slots.size();
</span><span class="cx"> for (auto& slotElement : descendantsOfType<HTMLSlotElement>(shadowRoot)) {
</span><del>- const AtomicString& slotName = slotElement.fastGetAttribute(nameAttr);
</del><ins>+ auto& slotName = slotNameFromAttributeValue(slotElement.fastGetAttribute(nameAttr));
</ins><span class="cx">
</span><del>- auto it = m_slots.find(treatNullAsEmpty(slotName));
</del><ins>+ auto it = m_slots.find(slotName);
</ins><span class="cx"> RELEASE_ASSERT(it != m_slots.end());
</span><span class="cx">
</span><span class="cx"> SlotInfo& slotInfo = *it->value;
</span><span class="lines">@@ -192,31 +215,36 @@
</span><span class="cx"> ASSERT(!m_slotAssignmentsIsValid);
</span><span class="cx"> m_slotAssignmentsIsValid = true;
</span><span class="cx">
</span><del>- auto* host = shadowRoot.host();
- RELEASE_ASSERT(host);
-
</del><span class="cx"> for (auto& entry : m_slots)
</span><span class="cx"> entry.value->assignedNodes.shrink(0);
</span><span class="cx">
</span><del>- for (Node* child = host->firstChild(); child; child = child->nextSibling()) {
- if (is<Element>(child)) {
- auto& slotName = downcast<Element>(*child).fastGetAttribute(slotAttr);
- if (!slotName.isNull()) {
- auto addResult = m_slots.add(treatNullAsEmpty(slotName), std::make_unique<SlotInfo>());
- addResult.iterator->value->assignedNodes.append(child);
- continue;
- }
- }
- auto defaultSlotEntry = m_slots.find(emptyAtom);
- if (defaultSlotEntry != m_slots.end())
- defaultSlotEntry->value->assignedNodes.append(child);
</del><ins>+ auto& host = *shadowRoot.host();
+ for (auto* child = host.firstChild(); child; child = child->nextSibling()) {
+ auto slotName = m_slotNameFunction(*child);
+ if (!slotName)
+ continue;
+ assignToSlot(*child, slotName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& entry : m_slots)
</span><span class="cx"> entry.value->assignedNodes.shrinkToFit();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SlotAssignment::assignToSlot(Node& child, const AtomicString& slotName)
+{
+ ASSERT(!slotName.isNull());
+ if (slotName == defaultSlotName()) {
+ auto defaultSlotEntry = m_slots.find(defaultSlotName());
+ if (defaultSlotEntry != m_slots.end())
+ defaultSlotEntry->value->assignedNodes.append(&child);
+ return;
+ }
+
+ auto addResult = m_slots.add(slotName, std::make_unique<SlotInfo>());
+ addResult.iterator->value->assignedNodes.append(&child);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomSlotAssignmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SlotAssignment.h (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SlotAssignment.h 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/dom/SlotAssignment.h 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef SlotAssignment_h
</span><span class="cx"> #define SlotAssignment_h
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -43,8 +43,14 @@
</span><span class="cx"> class SlotAssignment {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(SlotAssignment);
</span><span class="cx"> public:
</span><del>- SlotAssignment() { }
</del><ins>+ using SlotNameFunction = std::function<AtomicString (const Node& child)>;
</ins><span class="cx">
</span><ins>+ SlotAssignment();
+ SlotAssignment(SlotNameFunction);
+ ~SlotAssignment() { }
+
+ static const AtomicString& defaultSlotName() { return emptyAtom; }
+
</ins><span class="cx"> HTMLSlotElement* findAssignedSlot(const Node&, ShadowRoot&);
</span><span class="cx">
</span><span class="cx"> void addSlotElementByName(const AtomicString&, HTMLSlotElement&, ShadowRoot&);
</span><span class="lines">@@ -74,8 +80,12 @@
</span><span class="cx">
</span><span class="cx"> HTMLSlotElement* findFirstSlotElement(SlotInfo&, ShadowRoot&);
</span><span class="cx"> void resolveAllSlotElements(ShadowRoot&);
</span><ins>+
</ins><span class="cx"> void assignSlots(ShadowRoot&);
</span><ins>+ void assignToSlot(Node& child, const AtomicString& slotName);
</ins><span class="cx">
</span><ins>+ SlotNameFunction m_slotNameFunction;
+
</ins><span class="cx"> HashMap<AtomicString, std::unique_ptr<SlotInfo>> m_slots;
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDetailsElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDetailsElement.cpp (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDetailsElement.cpp 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/html/HTMLDetailsElement.cpp 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -23,92 +23,54 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DETAILS_ELEMENT)
</span><span class="cx"> #include "AXObjectCache.h"
</span><del>-#include "ContentDistributor.h"
</del><span class="cx"> #include "ElementIterator.h"
</span><ins>+#include "HTMLSlotElement.h"
</ins><span class="cx"> #include "HTMLSummaryElement.h"
</span><del>-#include "InsertionPoint.h"
</del><span class="cx"> #include "LocalizedStrings.h"
</span><span class="cx"> #include "MouseEvent.h"
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><ins>+#include "ShadowRoot.h"
+#include "SlotAssignment.h"
</ins><span class="cx"> #include "Text.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-static const AtomicString& summaryQuerySelector()
</del><ins>+static const AtomicString& summarySlotName()
</ins><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, selector, ("summary:first-of-type", AtomicString::ConstructFromLiteral));
- return selector;
-};
</del><ins>+ static NeverDestroyed<AtomicString> summarySlot("summarySlot");
+ return summarySlot;
+}
</ins><span class="cx">
</span><del>-class DetailsContentElement final : public InsertionPoint {
-public:
- static Ref<DetailsContentElement> create(Document&);
-
-private:
- DetailsContentElement(Document& document)
- : InsertionPoint(webkitShadowContentTag, document)
- {
- }
-
- virtual MatchType matchTypeFor(Node* node) const override
- {
- if (node->isElementNode() && node == node->parentNode()->querySelector(summaryQuerySelector(), ASSERT_NO_EXCEPTION))
- return NeverMatches;
- return AlwaysMatches;
- }
-};
-
-Ref<DetailsContentElement> DetailsContentElement::create(Document& document)
</del><ins>+static AtomicString slotNameFunction(const Node& child)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DetailsContentElement(document));
-}
</del><ins>+ auto& parent = *child.parentNode();
+ ASSERT(is<HTMLDetailsElement>(parent));
+ auto& details = downcast<HTMLDetailsElement>(parent);
</ins><span class="cx">
</span><del>-class DetailsSummaryElement final : public InsertionPoint {
-public:
- static Ref<DetailsSummaryElement> create(Document&);
-
- Element* fallbackSummary()
- {
- ASSERT(firstChild() && firstChild()->hasTagName(summaryTag));
- return downcast<Element>(firstChild());
</del><ins>+ // The first summary child gets assigned to the summary slot.
+ if (is<HTMLSummaryElement>(child)) {
+ if (&child == childrenOfType<HTMLSummaryElement>(details).first())
+ return summarySlotName();
</ins><span class="cx"> }
</span><ins>+ // Everything else is assigned to the default slot if details is open.
+ if (details.isOpen())
+ return SlotAssignment::defaultSlotName();
</ins><span class="cx">
</span><del>-private:
- DetailsSummaryElement(Document& document)
- : InsertionPoint(webkitShadowContentTag, document)
- {
- }
-
- virtual MatchType matchTypeFor(Node* node) const override
- {
- if (node->isElementNode() && node == node->parentNode()->querySelector(summaryQuerySelector(), ASSERT_NO_EXCEPTION))
- return AlwaysMatches;
- return NeverMatches;
- }
</del><ins>+ // Otherwise don't render the content.
+ return nullAtom;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-Ref<DetailsSummaryElement> DetailsSummaryElement::create(Document& document)
-{
- Ref<HTMLSummaryElement> summary = HTMLSummaryElement::create(summaryTag, document);
- summary->appendChild(Text::create(document, defaultDetailsSummaryText()), ASSERT_NO_EXCEPTION);
-
- Ref<DetailsSummaryElement> detailsSummary = adoptRef(*new DetailsSummaryElement(document));
- detailsSummary->appendChild(WTF::move(summary));
- return detailsSummary;
-}
-
</del><span class="cx"> Ref<HTMLDetailsElement> HTMLDetailsElement::create(const QualifiedName& tagName, Document& document)
</span><span class="cx"> {
</span><del>- Ref<HTMLDetailsElement> details = adoptRef(*new HTMLDetailsElement(tagName, document));
- details->addShadowRoot(ShadowRootWithInsertionPoints::create(document));
</del><ins>+ auto details = adoptRef(*new HTMLDetailsElement(tagName, document));
+ details->addShadowRoot(ShadowRoot::create(document, std::make_unique<SlotAssignment>(slotNameFunction)));
</ins><span class="cx"> return details;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLDetailsElement::HTMLDetailsElement(const QualifiedName& tagName, Document& document)
</span><span class="cx"> : HTMLElement(tagName, document)
</span><del>- , m_isOpen(false)
</del><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(detailsTag));
</span><span class="cx"> }
</span><span class="lines">@@ -120,16 +82,30 @@
</span><span class="cx">
</span><span class="cx"> void HTMLDetailsElement::didAddUserAgentShadowRoot(ShadowRoot* root)
</span><span class="cx"> {
</span><del>- root->appendChild(DetailsSummaryElement::create(document()), ASSERT_NO_EXCEPTION);
- root->appendChild(DetailsContentElement::create(document()), ASSERT_NO_EXCEPTION);
</del><ins>+ auto summarySlot = HTMLSlotElement::create(slotTag, document());
+ summarySlot->setAttribute(nameAttr, summarySlotName());
+ m_summarySlot = summarySlot.ptr();
+
+ auto defaultSummary = HTMLSummaryElement::create(summaryTag, document());
+ defaultSummary->appendChild(Text::create(document(), defaultDetailsSummaryText()), ASSERT_NO_EXCEPTION);
+ m_defaultSummary = defaultSummary.ptr();
+
+ summarySlot->appendChild(WTF::move(defaultSummary));
+ root->appendChild(WTF::move(summarySlot));
+
+ auto defaultSlot = HTMLSlotElement::create(slotTag, document());
+ root->appendChild(WTF::move(defaultSlot));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-const Element* HTMLDetailsElement::findMainSummary() const
</del><ins>+bool HTMLDetailsElement::isActiveSummary(const HTMLSummaryElement& summary) const
</ins><span class="cx"> {
</span><del>- if (auto summary = childrenOfType<HTMLSummaryElement>(*this).first())
- return summary;
</del><ins>+ if (!m_summarySlot->assignedNodes())
+ return &summary == m_defaultSummary;
</ins><span class="cx">
</span><del>- return static_cast<DetailsSummaryElement*>(userAgentShadowRoot()->firstChild())->fallbackSummary();
</del><ins>+ auto* slot = shadowRoot()->findAssignedSlot(summary);
+ if (!slot)
+ return false;
+ return slot == m_summarySlot;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLDetailsElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="lines">@@ -138,28 +114,12 @@
</span><span class="cx"> bool oldValue = m_isOpen;
</span><span class="cx"> m_isOpen = !value.isNull();
</span><span class="cx"> if (oldValue != m_isOpen)
</span><del>- setNeedsStyleRecalc(ReconstructRenderTree);
</del><ins>+ shadowRoot()->invalidateSlotAssignments();
</ins><span class="cx"> } else
</span><span class="cx"> HTMLElement::parseAttribute(name, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLDetailsElement::childShouldCreateRenderer(const Node& child) const
-{
- if (child.isPseudoElement())
- return HTMLElement::childShouldCreateRenderer(child);
</del><span class="cx">
</span><del>- if (!hasShadowRootOrActiveInsertionPointParent(child))
- return false;
-
- if (m_isOpen)
- return HTMLElement::childShouldCreateRenderer(child);
-
- if (!child.hasTagName(summaryTag))
- return false;
-
- return &child == findMainSummary() && HTMLElement::childShouldCreateRenderer(child);
-}
-
</del><span class="cx"> void HTMLDetailsElement::toggleOpen()
</span><span class="cx"> {
</span><span class="cx"> setAttribute(openAttr, m_isOpen ? nullAtom : emptyAtom);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDetailsElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDetailsElement.h (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDetailsElement.h 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/html/HTMLDetailsElement.h 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -25,25 +25,28 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class HTMLSlotElement;
+
</ins><span class="cx"> class HTMLDetailsElement final : public HTMLElement {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLDetailsElement> create(const QualifiedName& tagName, Document&);
</span><span class="cx"> void toggleOpen();
</span><span class="cx">
</span><del>- const Element* findMainSummary() const;
</del><span class="cx"> bool isOpen() const { return m_isOpen; }
</span><ins>+ bool isActiveSummary(const HTMLSummaryElement&) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HTMLDetailsElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) override;
</span><del>- virtual bool childShouldCreateRenderer(const Node&) const override;
</del><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
</span><span class="cx">
</span><span class="cx"> virtual void didAddUserAgentShadowRoot(ShadowRoot*) override;
</span><span class="cx"> virtual bool canHaveUserAgentShadowRoot() const override final { return true; }
</span><span class="cx">
</span><del>- bool m_isOpen;
</del><ins>+ bool m_isOpen { false };
+ HTMLSlotElement* m_summarySlot { nullptr };
+ HTMLSummaryElement* m_defaultSummary { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSlotElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSlotElement.cpp (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSlotElement.cpp 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/html/HTMLSlotElement.cpp 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "HTMLSlotElement.h"
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+
</ins><span class="cx"> #include "ElementChildIterator.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx">
</span><span class="lines">@@ -95,3 +97,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSlotElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSlotElement.h (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSlotElement.h 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/html/HTMLSlotElement.h 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef HTMLSlotElement_h
</span><span class="cx"> #define HTMLSlotElement_h
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+
</ins><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "InsertionPoint.h"
</span><span class="cx"> #include "Range.h"
</span><span class="lines">@@ -49,3 +51,4 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><ins>+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSummaryElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSummaryElement.cpp (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSummaryElement.cpp 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/html/HTMLSummaryElement.cpp 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -25,37 +25,22 @@
</span><span class="cx"> #include "DetailsMarkerControl.h"
</span><span class="cx"> #include "HTMLDetailsElement.h"
</span><span class="cx"> #include "HTMLFormControlElement.h"
</span><del>-#include "InsertionPoint.h"
</del><ins>+#include "HTMLSlotElement.h"
</ins><span class="cx"> #include "KeyboardEvent.h"
</span><span class="cx"> #include "MouseEvent.h"
</span><span class="cx"> #include "NodeRenderingTraversal.h"
</span><span class="cx"> #include "PlatformMouseEvent.h"
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><ins>+#include "ShadowRoot.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-class SummaryContentElement final : public InsertionPoint {
-public:
- static Ref<SummaryContentElement> create(Document&);
-
-private:
- SummaryContentElement(Document& document)
- : InsertionPoint(webkitShadowContentTag, document)
- {
- }
-};
-
-Ref<SummaryContentElement> SummaryContentElement::create(Document& document)
-{
- return adoptRef(*new SummaryContentElement(document));
-}
-
</del><span class="cx"> Ref<HTMLSummaryElement> HTMLSummaryElement::create(const QualifiedName& tagName, Document& document)
</span><span class="cx"> {
</span><span class="cx"> Ref<HTMLSummaryElement> summary = adoptRef(*new HTMLSummaryElement(tagName, document));
</span><del>- summary->addShadowRoot(ShadowRootWithInsertionPoints::create(document));
</del><ins>+ summary->addShadowRoot(ShadowRoot::create(document, ShadowRoot::Type::UserAgent));
</ins><span class="cx"> return summary;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -70,34 +55,30 @@
</span><span class="cx"> return createRenderer<RenderBlockFlow>(*this, WTF::move(style));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLSummaryElement::childShouldCreateRenderer(const Node& child) const
-{
- if (child.isPseudoElement())
- return HTMLElement::childShouldCreateRenderer(child);
-
- return hasShadowRootOrActiveInsertionPointParent(child) && HTMLElement::childShouldCreateRenderer(child);
-}
-
</del><span class="cx"> void HTMLSummaryElement::didAddUserAgentShadowRoot(ShadowRoot* root)
</span><span class="cx"> {
</span><span class="cx"> root->appendChild(DetailsMarkerControl::create(document()), ASSERT_NO_EXCEPTION);
</span><del>- root->appendChild(SummaryContentElement::create(document()), ASSERT_NO_EXCEPTION);
</del><ins>+ root->appendChild(HTMLSlotElement::create(slotTag, document()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLDetailsElement* HTMLSummaryElement::detailsElement() const
</span><span class="cx"> {
</span><del>- Node* mayDetails = NodeRenderingTraversal::parent(this);
- if (!mayDetails || !mayDetails->hasTagName(detailsTag))
- return nullptr;
- return downcast<HTMLDetailsElement>(mayDetails);
</del><ins>+ auto* parent = parentElement();
+ if (parent && is<HTMLDetailsElement>(*parent))
+ return downcast<HTMLDetailsElement>(parent);
+ // Fallback summary element is in the shadow tree.
+ auto* host = shadowHost();
+ if (host && is<HTMLDetailsElement>(*host))
+ return downcast<HTMLDetailsElement>(host);
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLSummaryElement::isMainSummary() const
</del><ins>+bool HTMLSummaryElement::isActiveSummary() const
</ins><span class="cx"> {
</span><del>- if (HTMLDetailsElement* details = detailsElement())
- return details->findMainSummary() == this;
-
- return false;
</del><ins>+ HTMLDetailsElement* details = detailsElement();
+ if (!details)
+ return false;
+ return details->isActiveSummary(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isClickableControl(Node* node)
</span><span class="lines">@@ -114,12 +95,12 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLSummaryElement::supportsFocus() const
</span><span class="cx"> {
</span><del>- return isMainSummary();
</del><ins>+ return isActiveSummary();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLSummaryElement::defaultEventHandler(Event* event)
</span><span class="cx"> {
</span><del>- if (isMainSummary() && renderer()) {
</del><ins>+ if (isActiveSummary() && renderer()) {
</ins><span class="cx"> if (event->type() == eventNames().DOMActivateEvent && !isClickableControl(event->target()->toNode())) {
</span><span class="cx"> if (HTMLDetailsElement* details = detailsElement())
</span><span class="cx"> details->toggleOpen();
</span><span class="lines">@@ -160,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLSummaryElement::willRespondToMouseClickEvents()
</span><span class="cx"> {
</span><del>- if (isMainSummary() && renderer())
</del><ins>+ if (isActiveSummary() && renderer())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return HTMLElement::willRespondToMouseClickEvents();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSummaryElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSummaryElement.h (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSummaryElement.h 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/html/HTMLSummaryElement.h 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -31,14 +31,13 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLSummaryElement> create(const QualifiedName&, Document&);
</span><span class="cx">
</span><del>- bool isMainSummary() const;
</del><ins>+ bool isActiveSummary() const;
</ins><span class="cx"> virtual bool willRespondToMouseClickEvents() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HTMLSummaryElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) override;
</span><del>- virtual bool childShouldCreateRenderer(const Node&) const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx">
</span><span class="cx"> virtual void didAddUserAgentShadowRoot(ShadowRoot*) override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowDetailsMarkerControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/DetailsMarkerControl.cpp (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/DetailsMarkerControl.cpp 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/html/shadow/DetailsMarkerControl.cpp 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> bool DetailsMarkerControl::rendererIsNeeded(const RenderStyle& style)
</span><span class="cx"> {
</span><del>- return downcast<HTMLSummaryElement>(shadowHost())->isMainSummary() && HTMLDivElement::rendererIsNeeded(style);
</del><ins>+ return downcast<HTMLSummaryElement>(shadowHost())->isActiveSummary() && HTMLDivElement::rendererIsNeeded(style);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreePositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreePosition.cpp (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreePosition.cpp 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/style/RenderTreePosition.cpp 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -37,8 +37,14 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!node.renderer());
</span><span class="cx"> if (m_hasValidNextSibling) {
</span><del>- // Stop validating at some point so the assert doesn't make us O(N^2) on debug builds.
- ASSERT(m_parent.isRenderView() || ++m_assertionLimitCounter > 20 || nextSiblingRenderer(node, m_parent) == m_nextSibling);
</del><ins>+#if !ASSERT_DISABLED
+ const unsigned oNSquaredAvoidanceLimit = 20;
+ bool skipAssert = m_parent.isRenderView() || ++m_assertionLimitCounter > oNSquaredAvoidanceLimit;
+ // FIXME: Traversal needs to know about slots and this needs be removed.
+ skipAssert = skipAssert || (node.parentElement() && node.parentElement()->shadowRoot());
+
+ ASSERT(skipAssert || nextSiblingRenderer(node, m_parent) == m_nextSibling);
+#endif
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_nextSibling = nextSiblingRenderer(node, m_parent);
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (190839 => 190840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-10-10 15:50:32 UTC (rev 190839)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-10-10 18:16:37 UTC (rev 190840)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "ElementRareData.h"
</span><span class="cx"> #include "FlowThreadController.h"
</span><span class="cx"> #include "HTMLSlotElement.h"
</span><del>-#include "InsertionPoint.h"
</del><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "LoaderStrategy.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="lines">@@ -222,8 +221,8 @@
</span><span class="cx">
</span><span class="cx"> static void invalidateWhitespaceOnlyTextSiblingsAfterAttachIfNeeded(Node& current)
</span><span class="cx"> {
</span><del>- if (is<InsertionPoint>(current))
- return;
</del><ins>+ // FIXME: This needs to traverse in composed tree order.
+
</ins><span class="cx"> // This function finds sibling text renderers where the results of textRendererIsNeeded may have changed as a result of
</span><span class="cx"> // the current node gaining or losing the renderer. This can only affect white space text nodes.
</span><span class="cx"> for (Node* sibling = current.nextSibling(); sibling; sibling = sibling->nextSibling()) {
</span><span class="lines">@@ -357,32 +356,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void attachDistributedChildren(InsertionPoint& insertionPoint, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition)
-{
- if (ShadowRoot* shadowRoot = insertionPoint.containingShadowRoot())
- ContentDistributor::ensureDistribution(shadowRoot);
-
- for (Node* current = insertionPoint.firstDistributed(); current; current = insertionPoint.nextDistributedTo(current)) {
- if (current->renderer())
- renderTreePosition.invalidateNextSibling(*current->renderer());
- if (is<Text>(*current)) {
- if (current->renderer())
- continue;
- attachTextRenderer(downcast<Text>(*current), renderTreePosition);
- continue;
- }
- if (is<Element>(*current)) {
- Element& currentElement = downcast<Element>(*current);
- if (currentElement.renderer())
- detachRenderTree(currentElement);
- attachRenderTree(currentElement, inheritedStyle, renderTreePosition, nullptr);
- }
- }
- // Use actual children as fallback content.
- if (!insertionPoint.hasDistribution())
- attachChildren(insertionPoint, inheritedStyle, renderTreePosition);
-}
-
</del><span class="cx"> static void attachShadowRoot(ShadowRoot& shadowRoot)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(shadowRoot.host());
</span><span class="lines">@@ -470,7 +443,7 @@
</span><span class="cx"> attachRenderTree(pseudoElement.get(), *current.renderStyle(), renderTreePosition, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx"> static void attachSlotAssignees(HTMLSlotElement& slot, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition)
</span><span class="cx"> {
</span><span class="cx"> if (auto* assignedNodes = slot.assignedNodes()) {
</span><span class="lines">@@ -480,14 +453,9 @@
</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><del>- } 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);
- }
- }
</del><ins>+ } else
+ attachChildren(slot, inheritedStyle, renderTreePosition);
+
</ins><span class="cx"> slot.clearNeedsStyleRecalc();
</span><span class="cx"> slot.clearChildNeedsStyleRecalc();
</span><span class="cx"> }
</span><span class="lines">@@ -498,18 +466,12 @@
</span><span class="cx"> PostResolutionCallbackDisabler callbackDisabler(current.document());
</span><span class="cx"> WidgetHierarchyUpdatesSuspensionScope suspendWidgetHierarchyUpdates;
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx"> if (is<HTMLSlotElement>(current)) {
</span><span class="cx"> attachSlotAssignees(downcast<HTMLSlotElement>(current), inheritedStyle, renderTreePosition);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- if (is<InsertionPoint>(current)) {
- attachDistributedChildren(downcast<InsertionPoint>(current), inheritedStyle, renderTreePosition);
- current.clearNeedsStyleRecalc();
- current.clearChildNeedsStyleRecalc();
- return;
- }
</del><span class="cx">
</span><span class="cx"> if (current.hasCustomStyleResolveCallbacks())
</span><span class="cx"> current.willAttachRenderers();
</span><span class="lines">@@ -529,7 +491,7 @@
</span><span class="cx"> } else if (current.firstChild())
</span><span class="cx"> parentPusher.push();
</span><span class="cx">
</span><del>- bool skipChildren = shadowRoot && shadowRoot->type() != ShadowRoot::Type::UserAgent;
</del><ins>+ bool skipChildren = shadowRoot;
</ins><span class="cx"> if (!skipChildren)
</span><span class="cx"> attachChildren(current, renderer->style(), childRenderTreePosition);
</span><span class="cx">
</span><span class="lines">@@ -549,18 +511,6 @@
</span><span class="cx"> current.didAttachRenderers();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void detachDistributedChildren(InsertionPoint& insertionPoint)
-{
- for (Node* current = insertionPoint.firstDistributed(); current; current = insertionPoint.nextDistributedTo(current)) {
- if (is<Text>(*current)) {
- detachTextRenderer(downcast<Text>(*current));
- continue;
- }
- if (is<Element>(*current))
- detachRenderTree(downcast<Element>(*current));
- }
-}
-
</del><span class="cx"> static void detachChildren(ContainerNode& current, DetachType detachType)
</span><span class="cx"> {
</span><span class="cx"> for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
</span><span class="lines">@@ -577,7 +527,7 @@
</span><span class="cx"> detachChildren(shadowRoot, detachType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx"> static void detachSlotAssignees(HTMLSlotElement& slot, DetachType detachType)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!slot.renderer());
</span><span class="lines">@@ -588,14 +538,9 @@
</span><span class="cx"> else if (is<Element>(*child))
</span><span class="cx"> detachRenderTree(downcast<Element>(*child), detachType);
</span><span class="cx"> }
</span><del>- } 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);
- }
- }
</del><ins>+ } else
+ detachChildren(slot, detachType);
+
</ins><span class="cx"> slot.clearNeedsStyleRecalc();
</span><span class="cx"> slot.clearChildNeedsStyleRecalc();
</span><span class="cx"> }
</span><span class="lines">@@ -615,10 +560,8 @@
</span><span class="cx"> if (detachType != ReattachDetach)
</span><span class="cx"> current.clearHoverAndActiveStatusBeforeDetachingRenderer();
</span><span class="cx">
</span><del>- if (is<InsertionPoint>(current))
- detachDistributedChildren(downcast<InsertionPoint>(current));
-#if ENABLE(SHADOW_DOM)
- else if (is<HTMLSlotElement>(current))
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ if (is<HTMLSlotElement>(current))
</ins><span class="cx"> detachSlotAssignees(downcast<HTMLSlotElement>(current), detachType);
</span><span class="cx"> #endif
</span><span class="cx"> else if (ShadowRoot* shadowRoot = current.shadowRoot())
</span><span class="lines">@@ -856,7 +799,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx"> static void resolveSlotAssignees(HTMLSlotElement& slot, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition, Change change)
</span><span class="cx"> {
</span><span class="cx"> if (auto* assignedNodes = slot.assignedNodes()) {
</span><span class="lines">@@ -883,17 +826,12 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(change != Detach);
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
</del><ins>+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</ins><span class="cx"> if (is<HTMLSlotElement>(current)) {
</span><span class="cx"> resolveSlotAssignees(downcast<HTMLSlotElement>(current), inheritedStyle, renderTreePosition, change);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- if (is<InsertionPoint>(current)) {
- current.clearNeedsStyleRecalc();
- current.clearChildNeedsStyleRecalc();
- return;
- }
</del><span class="cx">
</span><span class="cx"> if (current.hasCustomStyleResolveCallbacks()) {
</span><span class="cx"> if (!current.willRecalcStyle(change))
</span><span class="lines">@@ -920,7 +858,7 @@
</span><span class="cx"> RenderTreePosition childRenderTreePosition(*renderer);
</span><span class="cx"> updateBeforeOrAfterPseudoElement(current, change, BEFORE, childRenderTreePosition);
</span><span class="cx">
</span><del>- bool skipChildren = shadowRoot && shadowRoot->type() != ShadowRoot::Type::UserAgent;
</del><ins>+ bool skipChildren = shadowRoot;
</ins><span class="cx"> if (!skipChildren)
</span><span class="cx"> resolveChildren(current, renderer->style(), change, childRenderTreePosition);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>