<!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>[204543] 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/204543">204543</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-16 17:25:36 -0700 (Tue, 16 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for ShadowRoot.mode attribute
https://bugs.webkit.org/show_bug.cgi?id=160919
Reviewed by Ryosuke Niwa.
LayoutTests/imported/w3c:
Rebaseline W3C test now that one more check is passing.
* web-platform-tests/dom/interfaces-expected.txt:
Source/WebCore:
Add support for ShadowRoot.mode attribute:
- https://dom.spec.whatwg.org/#interface-shadowroot
Test: fast/shadow-dom/ShadowRoot-mode.html
* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::collectMatchingRules):
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::matchRecursively):
* dom/Element.cpp:
(WebCore::Element::bindingsOffsetParent):
(WebCore::Element::addShadowRoot):
(WebCore::Element::attachShadow):
(WebCore::Element::shadowRootForBindings):
(WebCore::Element::userAgentShadowRoot):
(WebCore::Element::ensureUserAgentShadowRoot):
* dom/Node.cpp:
(WebCore::Node::isUnclosedNode):
(WebCore::Node::assignedSlotForBindings):
(WebCore::Node::isInUserAgentShadowTree):
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::ShadowRoot):
(WebCore::ShadowRoot::styleResolver):
* dom/ShadowRoot.h:
* dom/ShadowRoot.idl:
* dom/SlotAssignment.cpp:
(WebCore::SlotAssignment::didChangeSlot):
* html/HTMLSummaryElement.cpp:
(WebCore::HTMLSummaryElement::create):
* inspector/InspectorDOMAgent.cpp:
(WebCore::shadowRootType):
(WebCore::InspectorDOMAgent::buildObjectForNode):
* rendering/HitTestResult.cpp:
(WebCore::moveOutOfUserAgentShadowTree):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::selectionPseudoStyle):
* rendering/RenderLayer.cpp:
(WebCore::rendererForScrollbar):
* svg/SVGElement.cpp:
(WebCore::SVGElement::correspondingUseElement):
* testing/Internals.cpp:
(WebCore::Internals::shadowRootType):
LayoutTests:
Add layout test coverage.
* fast/shadow-dom/ShadowRoot-mode-expected.txt: Added.
* fast/shadow-dom/ShadowRoot-mode.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsdominterfacesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorcpp">trunk/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.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="#trunkSourceWebCoredomShadowRootidl">trunk/Source/WebCore/dom/ShadowRoot.idl</a></li>
<li><a href="#trunkSourceWebCoredomSlotAssignmentcpp">trunk/Source/WebCore/dom/SlotAssignment.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSummaryElementcpp">trunk/Source/WebCore/html/HTMLSummaryElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResultcpp">trunk/Source/WebCore/rendering/HitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomShadowRootmodeexpectedtxt">trunk/LayoutTests/fast/shadow-dom/ShadowRoot-mode-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomShadowRootmodehtml">trunk/LayoutTests/fast/shadow-dom/ShadowRoot-mode.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/LayoutTests/ChangeLog 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-16 Chris Dumez <cdumez@apple.com>
+
+ Add support for ShadowRoot.mode attribute
+ https://bugs.webkit.org/show_bug.cgi?id=160919
+
+ Reviewed by Ryosuke Niwa.
+
+ Add layout test coverage.
+
+ * fast/shadow-dom/ShadowRoot-mode-expected.txt: Added.
+ * fast/shadow-dom/ShadowRoot-mode.html: Added.
+
</ins><span class="cx"> 2016-08-16 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> customElements.define should retrieve lifecycle callbacks
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomShadowRootmodeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/ShadowRoot-mode-expected.txt (0 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/ShadowRoot-mode-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/ShadowRoot-mode-expected.txt 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Tests support for ShadowRoot.mode attribute.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS shadowRoot1.mode is "open"
+PASS shadowRoot2.mode is "closed"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomShadowRootmodehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/ShadowRoot-mode.html (0 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/ShadowRoot-mode.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/ShadowRoot-mode.html 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+description("Tests support for ShadowRoot.mode attribute.");
+
+var element1 = document.createElement('div');
+var shadowRoot1 = element1.attachShadow({ mode: "open" });
+shouldBeEqualToString("shadowRoot1.mode", "open");
+
+var element2 = document.createElement('div');
+var shadowRoot2 = element2.attachShadow({ mode: "closed" });
+shouldBeEqualToString("shadowRoot2.mode", "closed");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-08-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Add support for ShadowRoot.mode attribute
+ https://bugs.webkit.org/show_bug.cgi?id=160919
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline W3C test now that one more check is passing.
+
+ * web-platform-tests/dom/interfaces-expected.txt:
+
+2016-08-16 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Align isDefaultNamespace() / lookupPrefix() / lookupNamespaceURI() with the specification
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160911
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdominterfacesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx"> PASS ShadowRoot interface object name
</span><span class="cx"> PASS ShadowRoot interface: existence and properties of interface prototype object
</span><span class="cx"> PASS ShadowRoot interface: existence and properties of interface prototype object's "constructor" property
</span><del>-FAIL ShadowRoot interface: attribute mode assert_true: The prototype object must have a property "mode" expected true got false
</del><ins>+PASS ShadowRoot interface: attribute mode
</ins><span class="cx"> PASS ShadowRoot interface: attribute host
</span><span class="cx"> PASS Element interface: existence and properties of interface object
</span><span class="cx"> PASS Element interface object length
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/ChangeLog 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2016-08-16 Chris Dumez <cdumez@apple.com>
+
+ Add support for ShadowRoot.mode attribute
+ https://bugs.webkit.org/show_bug.cgi?id=160919
+
+ Reviewed by Ryosuke Niwa.
+
+ Add support for ShadowRoot.mode attribute:
+ - https://dom.spec.whatwg.org/#interface-shadowroot
+
+ Test: fast/shadow-dom/ShadowRoot-mode.html
+
+ * css/ElementRuleCollector.cpp:
+ (WebCore::ElementRuleCollector::collectMatchingRules):
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::matchRecursively):
+ * dom/Element.cpp:
+ (WebCore::Element::bindingsOffsetParent):
+ (WebCore::Element::addShadowRoot):
+ (WebCore::Element::attachShadow):
+ (WebCore::Element::shadowRootForBindings):
+ (WebCore::Element::userAgentShadowRoot):
+ (WebCore::Element::ensureUserAgentShadowRoot):
+ * dom/Node.cpp:
+ (WebCore::Node::isUnclosedNode):
+ (WebCore::Node::assignedSlotForBindings):
+ (WebCore::Node::isInUserAgentShadowTree):
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::ShadowRoot):
+ (WebCore::ShadowRoot::styleResolver):
+ * dom/ShadowRoot.h:
+ * dom/ShadowRoot.idl:
+ * dom/SlotAssignment.cpp:
+ (WebCore::SlotAssignment::didChangeSlot):
+ * html/HTMLSummaryElement.cpp:
+ (WebCore::HTMLSummaryElement::create):
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::shadowRootType):
+ (WebCore::InspectorDOMAgent::buildObjectForNode):
+ * rendering/HitTestResult.cpp:
+ (WebCore::moveOutOfUserAgentShadowTree):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::selectionPseudoStyle):
+ * rendering/RenderLayer.cpp:
+ (WebCore::rendererForScrollbar):
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::correspondingUseElement):
+ * testing/Internals.cpp:
+ (WebCore::Internals::shadowRootType):
+
</ins><span class="cx"> 2016-08-16 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> customElements.define should retrieve lifecycle callbacks
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> auto* shadowRoot = m_element.containingShadowRoot();
</span><del>- if (shadowRoot && shadowRoot->type() == ShadowRoot::Type::UserAgent) {
</del><ins>+ if (shadowRoot && shadowRoot->mode() == ShadowRoot::Mode::UserAgent) {
</ins><span class="cx"> const AtomicString& pseudoId = m_element.shadowPseudoId();
</span><span class="cx"> if (!pseudoId.isEmpty())
</span><span class="cx"> collectMatchingRulesForList(matchRequest.ruleSet->shadowPseudoElementRules(pseudoId.impl()), matchRequest, ruleRange);
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> if (context.element->shadowPseudoId() != context.selector->value())
</span><span class="cx"> return MatchResult::fails(Match::SelectorFailsLocally);
</span><span class="cx">
</span><del>- if (context.selector->isWebKitCustomPseudoElement() && root->type() != ShadowRoot::Type::UserAgent)
</del><ins>+ if (context.selector->isWebKitCustomPseudoElement() && root->mode() != ShadowRoot::Mode::UserAgent)
</ins><span class="cx"> return MatchResult::fails(Match::SelectorFailsLocally);
</span><span class="cx"> } else
</span><span class="cx"> return MatchResult::fails(Match::SelectorFailsLocally);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -810,7 +810,7 @@
</span><span class="cx"> Element* element = offsetParent();
</span><span class="cx"> if (!element || !element->isInShadowTree())
</span><span class="cx"> return element;
</span><del>- return element->containingShadowRoot()->type() == ShadowRoot::Type::UserAgent ? nullptr : element;
</del><ins>+ return element->containingShadowRoot()->mode() == ShadowRoot::Mode::UserAgent ? nullptr : element;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Element* Element::offsetParent()
</span><span class="lines">@@ -1674,7 +1674,7 @@
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didPushShadowRoot(*this, shadowRoot);
</span><span class="cx">
</span><del>- if (shadowRoot.type() == ShadowRoot::Type::UserAgent)
</del><ins>+ if (shadowRoot.mode() == ShadowRoot::Mode::UserAgent)
</ins><span class="cx"> didAddUserAgentShadowRoot(&shadowRoot);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1753,7 +1753,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto shadow = ShadowRoot::create(document(), init.mode == ShadowRootMode::Open ? ShadowRoot::Type::Open : ShadowRoot::Type::Closed);
</del><ins>+ auto shadow = ShadowRoot::create(document(), init.mode == ShadowRootMode::Open ? ShadowRoot::Mode::Open : ShadowRoot::Mode::Closed);
</ins><span class="cx"> addShadowRoot(shadow.copyRef());
</span><span class="cx"> return WTFMove(shadow);
</span><span class="cx"> }
</span><span class="lines">@@ -1764,7 +1764,7 @@
</span><span class="cx"> if (!root)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (root->type() != ShadowRoot::Type::Open) {
</del><ins>+ if (root->mode() != ShadowRoot::Mode::Open) {
</ins><span class="cx"> if (!JSC::jsCast<JSDOMGlobalObject*>(state.lexicalGlobalObject())->world().shadowRootIsAlwaysOpen())
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -1775,7 +1775,7 @@
</span><span class="cx"> ShadowRoot* Element::userAgentShadowRoot() const
</span><span class="cx"> {
</span><span class="cx"> if (ShadowRoot* shadowRoot = this->shadowRoot()) {
</span><del>- ASSERT(shadowRoot->type() == ShadowRoot::Type::UserAgent);
</del><ins>+ ASSERT(shadowRoot->mode() == ShadowRoot::Mode::UserAgent);
</ins><span class="cx"> return shadowRoot;
</span><span class="cx"> }
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1785,7 +1785,7 @@
</span><span class="cx"> {
</span><span class="cx"> ShadowRoot* shadowRoot = userAgentShadowRoot();
</span><span class="cx"> if (!shadowRoot) {
</span><del>- addShadowRoot(ShadowRoot::create(document(), ShadowRoot::Type::UserAgent));
</del><ins>+ addShadowRoot(ShadowRoot::create(document(), ShadowRoot::Mode::UserAgent));
</ins><span class="cx"> shadowRoot = userAgentShadowRoot();
</span><span class="cx"> }
</span><span class="cx"> return *shadowRoot;
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -1088,7 +1088,7 @@
</span><span class="cx"> return true; // treeScopeThatCanAccessOtherNode is a shadow-including inclusive ancestor of this node.
</span><span class="cx"> }
</span><span class="cx"> auto& root = treeScopeThatCanAccessOtherNode->rootNode();
</span><del>- if (is<ShadowRoot>(root) && downcast<ShadowRoot>(root).type() != ShadowRoot::Type::Open)
</del><ins>+ if (is<ShadowRoot>(root) && downcast<ShadowRoot>(root).mode() != ShadowRoot::Mode::Open)
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1112,7 +1112,7 @@
</span><span class="cx"> HTMLSlotElement* Node::assignedSlotForBindings() const
</span><span class="cx"> {
</span><span class="cx"> auto* shadowRoot = parentShadowRoot(*this);
</span><del>- if (shadowRoot && shadowRoot->type() == ShadowRoot::Type::Open)
</del><ins>+ if (shadowRoot && shadowRoot->mode() == ShadowRoot::Mode::Open)
</ins><span class="cx"> return shadowRoot->findAssignedSlot(*this);
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -1130,7 +1130,7 @@
</span><span class="cx"> bool Node::isInUserAgentShadowTree() const
</span><span class="cx"> {
</span><span class="cx"> auto* shadowRoot = containingShadowRoot();
</span><del>- return shadowRoot && shadowRoot->type() == ShadowRoot::Type::UserAgent;
</del><ins>+ return shadowRoot && shadowRoot->mode() == ShadowRoot::Mode::UserAgent;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* Node::nonBoundaryShadowTreeRootNode()
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> COMPILE_ASSERT(sizeof(ShadowRoot) == sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small);
</span><span class="cx">
</span><del>-ShadowRoot::ShadowRoot(Document& document, Type type)
</del><ins>+ShadowRoot::ShadowRoot(Document& document, Mode type)
</ins><span class="cx"> : DocumentFragment(document, CreateShadowRoot)
</span><span class="cx"> , TreeScope(*this, document)
</span><span class="cx"> , m_type(type)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> ShadowRoot::ShadowRoot(Document& document, std::unique_ptr<SlotAssignment>&& slotAssignment)
</span><span class="cx"> : DocumentFragment(document, CreateShadowRoot)
</span><span class="cx"> , TreeScope(*this, document)
</span><del>- , m_type(Type::UserAgent)
</del><ins>+ , m_type(Mode::UserAgent)
</ins><span class="cx"> , m_slotAssignment(WTFMove(slotAssignment))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> StyleResolver& ShadowRoot::styleResolver()
</span><span class="cx"> {
</span><del>- if (m_type == Type::UserAgent)
</del><ins>+ if (m_type == Mode::UserAgent)
</ins><span class="cx"> return document().userAgentShadowTreeStyleResolver();
</span><span class="cx">
</span><span class="cx"> if (!m_styleResolver) {
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.h (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.h 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/dom/ShadowRoot.h 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -42,13 +42,13 @@
</span><span class="cx">
</span><span class="cx"> class ShadowRoot final : public DocumentFragment, public TreeScope {
</span><span class="cx"> public:
</span><del>- enum class Type : uint8_t {
</del><ins>+ enum class Mode : uint8_t {
</ins><span class="cx"> UserAgent = 0,
</span><span class="cx"> Closed,
</span><span class="cx"> Open,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static Ref<ShadowRoot> create(Document& document, Type type)
</del><ins>+ static Ref<ShadowRoot> create(Document& document, Mode type)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new ShadowRoot(document, type));
</span><span class="cx"> }
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> Element* activeElement() const;
</span><span class="cx">
</span><del>- Type type() const { return m_type; }
</del><ins>+ Mode mode() const { return m_type; }
</ins><span class="cx">
</span><span class="cx"> void removeAllEventListeners() override;
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> const Vector<Node*>* assignedNodesForSlot(const HTMLSlotElement&);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- ShadowRoot(Document&, Type);
</del><ins>+ ShadowRoot(Document&, Mode);
</ins><span class="cx">
</span><span class="cx"> ShadowRoot(Document&, std::unique_ptr<SlotAssignment>&&);
</span><span class="cx">
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> Ref<Node> cloneNodeInternal(Document&, CloningOperation) override;
</span><span class="cx">
</span><span class="cx"> bool m_resetStyleInheritance { false };
</span><del>- Type m_type { Type::UserAgent };
</del><ins>+ Mode m_type { Mode::UserAgent };
</ins><span class="cx">
</span><span class="cx"> Element* m_host { nullptr };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.idl (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.idl 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/dom/ShadowRoot.idl 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -27,8 +27,12 @@
</span><span class="cx"> EnabledAtRuntime=ShadowDOM,
</span><span class="cx"> JSGenerateToJSObject
</span><span class="cx"> ] interface ShadowRoot : DocumentFragment {
</span><ins>+ readonly attribute ShadowRootMode mode;
</ins><span class="cx"> readonly attribute Element activeElement;
</span><span class="cx"> readonly attribute Element host;
</span><span class="cx">
</span><span class="cx"> [TreatNullAs=EmptyString, SetterRaisesException] attribute DOMString innerHTML;
</span><span class="cx"> };
</span><ins>+
+// "user-agent" is a WebKit extension that is not exposed to the Web.
+enum ShadowRootMode { "user-agent", "closed", "open" };
</ins></span></pre></div>
<a id="trunkSourceWebCoredomSlotAssignmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SlotAssignment.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SlotAssignment.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/dom/SlotAssignment.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> m_slotAssignmentsIsValid = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (shadowRoot.type() == ShadowRoot::Type::UserAgent)
</del><ins>+ if (shadowRoot.mode() == ShadowRoot::Mode::UserAgent)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> recursivelyFireSlotChangeEvent(*slotElement);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSummaryElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSummaryElement.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSummaryElement.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/html/HTMLSummaryElement.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><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(ShadowRoot::create(document, ShadowRoot::Type::UserAgent));
</del><ins>+ summary->addShadowRoot(ShadowRoot::create(document, ShadowRoot::Mode::UserAgent));
</ins><span class="cx"> return summary;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -1280,14 +1280,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Inspector::Protocol::DOM::ShadowRootType shadowRootType(ShadowRoot::Type type)
</del><ins>+static Inspector::Protocol::DOM::ShadowRootType shadowRootType(ShadowRoot::Mode mode)
</ins><span class="cx"> {
</span><del>- switch (type) {
- case ShadowRoot::Type::UserAgent:
</del><ins>+ switch (mode) {
+ case ShadowRoot::Mode::UserAgent:
</ins><span class="cx"> return Inspector::Protocol::DOM::ShadowRootType::UserAgent;
</span><del>- case ShadowRoot::Type::Closed:
</del><ins>+ case ShadowRoot::Mode::Closed:
</ins><span class="cx"> return Inspector::Protocol::DOM::ShadowRootType::Closed;
</span><del>- case ShadowRoot::Type::Open:
</del><ins>+ case ShadowRoot::Mode::Open:
</ins><span class="cx"> return Inspector::Protocol::DOM::ShadowRootType::Open;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1407,7 +1407,7 @@
</span><span class="cx"> value->setValue(attribute.value());
</span><span class="cx"> } else if (is<ShadowRoot>(*node)) {
</span><span class="cx"> ShadowRoot& shadowRoot = downcast<ShadowRoot>(*node);
</span><del>- value->setShadowRootType(shadowRootType(shadowRoot.type()));
</del><ins>+ value->setShadowRootType(shadowRootType(shadowRoot.mode()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Need to enable AX to get the computed role.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/rendering/HitTestResult.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (node.isInShadowTree()) {
</span><span class="cx"> if (ShadowRoot* root = node.containingShadowRoot()) {
</span><del>- if (root->type() == ShadowRoot::Type::UserAgent)
</del><ins>+ if (root->mode() == ShadowRoot::Mode::UserAgent)
</ins><span class="cx"> return root->host();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -1583,7 +1583,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (ShadowRoot* root = element()->containingShadowRoot()) {
</span><del>- if (root->type() == ShadowRoot::Type::UserAgent) {
</del><ins>+ if (root->mode() == ShadowRoot::Mode::UserAgent) {
</ins><span class="cx"> if (Element* shadowHost = element()->shadowHost())
</span><span class="cx"> return shadowHost->renderer()->getUncachedPseudoStyle(PseudoStyleRequest(SELECTION));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -3096,7 +3096,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (Element* element = renderer.element()) {
</span><span class="cx"> if (ShadowRoot* shadowRoot = element->containingShadowRoot()) {
</span><del>- if (shadowRoot->type() == ShadowRoot::Type::UserAgent)
</del><ins>+ if (shadowRoot->mode() == ShadowRoot::Mode::UserAgent)
</ins><span class="cx"> return shadowRoot->host()->renderer();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> auto* root = containingShadowRoot();
</span><span class="cx"> if (!root)
</span><span class="cx"> return nullptr;
</span><del>- if (root->type() != ShadowRoot::Type::UserAgent)
</del><ins>+ if (root->mode() != ShadowRoot::Mode::UserAgent)
</ins><span class="cx"> return nullptr;
</span><span class="cx"> auto* host = root->host();
</span><span class="cx"> if (!is<SVGUseElement>(host))
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (204542 => 204543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-08-17 00:18:43 UTC (rev 204542)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-08-17 00:25:36 UTC (rev 204543)
</span><span class="lines">@@ -822,12 +822,12 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch (downcast<ShadowRoot>(root).type()) {
- case ShadowRoot::Type::UserAgent:
</del><ins>+ switch (downcast<ShadowRoot>(root).mode()) {
+ case ShadowRoot::Mode::UserAgent:
</ins><span class="cx"> return String("UserAgentShadowRoot");
</span><del>- case ShadowRoot::Type::Closed:
</del><ins>+ case ShadowRoot::Mode::Closed:
</ins><span class="cx"> return String("ClosedShadowRoot");
</span><del>- case ShadowRoot::Type::Open:
</del><ins>+ case ShadowRoot::Mode::Open:
</ins><span class="cx"> return String("OpenShadowRoot");
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre>
</div>
</div>
</body>
</html>