<!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>[209661] trunk/Source/WebCore</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/209661">209661</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-10 02:19:00 -0800 (Sat, 10 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace isUnclosedNode by isClosedShadowHidden
https://bugs.webkit.org/show_bug.cgi?id=165722
Reviewed by Antti Koivisto.
Replaced Node::isUnclosedNode by Node::isClosedShadowHidden and negated the semantics as done in the spec:
https://dom.spec.whatwg.org/#concept-closed-shadow-hidden
https://github.com/whatwg/dom/pull/306
Also added a version which follows the spec text for a debug assertion.
No new tests since this has no behavioral change.
* dom/EventContext.h:
(WebCore::EventContext::isUnreachableNode):
* dom/EventPath.cpp:
(WebCore::EventPath::computePathUnclosedToTarget):
(WebCore::RelatedNodeRetargeter::checkConsistency):
* dom/Node.cpp:
(WebCore::isClosedShadowHiddenUsingSpecDefinition): Added to assert our implementation matches the spec text.
(WebCore::Node::isClosedShadowHidden): Renamed from Node::isUnclosedNode and negated the return value.
* dom/Node.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomEventContexth">trunk/Source/WebCore/dom/EventContext.h</a></li>
<li><a href="#trunkSourceWebCoredomEventPathcpp">trunk/Source/WebCore/dom/EventPath.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209660 => 209661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-10 10:00:33 UTC (rev 209660)
+++ trunk/Source/WebCore/ChangeLog 2016-12-10 10:19:00 UTC (rev 209661)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-12-10 Ryosuke Niwa <rniwa@webkit.org>
+
+ Replace isUnclosedNode by isClosedShadowHidden
+ https://bugs.webkit.org/show_bug.cgi?id=165722
+
+ Reviewed by Antti Koivisto.
+
+ Replaced Node::isUnclosedNode by Node::isClosedShadowHidden and negated the semantics as done in the spec:
+ https://dom.spec.whatwg.org/#concept-closed-shadow-hidden
+ https://github.com/whatwg/dom/pull/306
+
+ Also added a version which follows the spec text for a debug assertion.
+
+ No new tests since this has no behavioral change.
+
+ * dom/EventContext.h:
+ (WebCore::EventContext::isUnreachableNode):
+ * dom/EventPath.cpp:
+ (WebCore::EventPath::computePathUnclosedToTarget):
+ (WebCore::RelatedNodeRetargeter::checkConsistency):
+ * dom/Node.cpp:
+ (WebCore::isClosedShadowHiddenUsingSpecDefinition): Added to assert our implementation matches the spec text.
+ (WebCore::Node::isClosedShadowHidden): Renamed from Node::isUnclosedNode and negated the return value.
+ * dom/Node.h:
+
</ins><span class="cx"> 2016-12-10 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> CrashTracer: com.apple.WebKit.WebContent.Development at com.apple.WebCore: WTF::match_constness<WebCore::CSSValue, WebCore::CSSContentDistributionValue>::type& WTF::downcast<WebCore::CSSContentDistributionValue, WebCore::CSSValue> + 65
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventContext.h (209660 => 209661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventContext.h 2016-12-10 10:00:33 UTC (rev 209660)
+++ trunk/Source/WebCore/dom/EventContext.h 2016-12-10 10:19:00 UTC (rev 209661)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> inline bool EventContext::isUnreachableNode(EventTarget* target) const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Checks also for SVG elements.
</span><del>- return target && target->toNode() && !target->toNode()->isSVGElement() && !m_node->isUnclosedNode(*target->toNode());
</del><ins>+ return target && target->toNode() && !target->toNode()->isSVGElement() && m_node->isClosedShadowHidden(*target->toNode());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventPath.cpp (209660 => 209661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventPath.cpp 2016-12-10 10:00:33 UTC (rev 209660)
+++ trunk/Source/WebCore/dom/EventPath.cpp 2016-12-10 10:19:00 UTC (rev 209661)
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx">
</span><span class="cx"> for (auto& context : m_path) {
</span><span class="cx"> if (Node* nodeInPath = context->currentTarget()->toNode()) {
</span><del>- if (targetNode->isUnclosedNode(*nodeInPath))
</del><ins>+ if (!targetNode->isClosedShadowHidden(*nodeInPath))
</ins><span class="cx"> path.append(context->currentTarget());
</span><span class="cx"> } else
</span><span class="cx"> path.append(context->currentTarget());
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_retargetedRelatedNode)
</span><span class="cx"> return;
</span><del>- ASSERT(currentTarget.isUnclosedNode(*m_retargetedRelatedNode));
</del><ins>+ ASSERT(!currentTarget.isClosedShadowHidden(*m_retargetedRelatedNode));
</ins><span class="cx"> ASSERT(m_retargetedRelatedNode == &currentTarget.treeScope().retargetToScope(m_relatedNode));
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (209660 => 209661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-12-10 10:00:33 UTC (rev 209660)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-12-10 10:19:00 UTC (rev 209661)
</span><span class="lines">@@ -1073,8 +1073,18 @@
</span><span class="cx"> return is<ShadowRoot>(root) ? downcast<ShadowRoot>(&root) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !ASSERT_DISABLED
+// https://dom.spec.whatwg.org/#concept-closed-shadow-hidden
+static bool isClosedShadowHiddenUsingSpecDefinition(const Node& A, const Node& B)
+{
+ return A.isInShadowTree()
+ && !A.rootNode().containsIncludingShadowDOM(&B)
+ && (A.containingShadowRoot()->mode() != ShadowRootMode::Open || isClosedShadowHiddenUsingSpecDefinition(*A.shadowHost(), B));
+}
+#endif
+
</ins><span class="cx"> // http://w3c.github.io/webcomponents/spec/shadow/#dfn-unclosed-node
</span><del>-bool Node::isUnclosedNode(const Node& otherNode) const
</del><ins>+bool Node::isClosedShadowHidden(const Node& otherNode) const
</ins><span class="cx"> {
</span><span class="cx"> // Use Vector instead of HashSet since we expect the number of ancestor tree scopes to be small.
</span><span class="cx"> Vector<TreeScope*, 8> ancestorScopesOfThisNode;
</span><span class="lines">@@ -1084,8 +1094,10 @@
</span><span class="cx">
</span><span class="cx"> for (auto* treeScopeThatCanAccessOtherNode = &otherNode.treeScope(); treeScopeThatCanAccessOtherNode; treeScopeThatCanAccessOtherNode = treeScopeThatCanAccessOtherNode->parentTreeScope()) {
</span><span class="cx"> for (auto* scope : ancestorScopesOfThisNode) {
</span><del>- if (scope == treeScopeThatCanAccessOtherNode)
- return true; // treeScopeThatCanAccessOtherNode is a shadow-including inclusive ancestor of this node.
</del><ins>+ if (scope == treeScopeThatCanAccessOtherNode) {
+ ASSERT(!isClosedShadowHiddenUsingSpecDefinition(otherNode, *this));
+ return false; // treeScopeThatCanAccessOtherNode is a shadow-including inclusive ancestor of this node.
+ }
</ins><span class="cx"> }
</span><span class="cx"> auto& root = treeScopeThatCanAccessOtherNode->rootNode();
</span><span class="cx"> if (is<ShadowRoot>(root) && downcast<ShadowRoot>(root).mode() != ShadowRootMode::Open)
</span><span class="lines">@@ -1092,7 +1104,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return false;
</del><ins>+ ASSERT(isClosedShadowHiddenUsingSpecDefinition(otherNode, *this));
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline ShadowRoot* parentShadowRoot(const Node& node)
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (209660 => 209661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2016-12-10 10:00:33 UTC (rev 209660)
+++ trunk/Source/WebCore/dom/Node.h 2016-12-10 10:19:00 UTC (rev 209661)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> WEBCORE_EXPORT Node* deprecatedShadowAncestorNode() const;
</span><span class="cx"> ShadowRoot* containingShadowRoot() const;
</span><span class="cx"> ShadowRoot* shadowRoot() const;
</span><del>- bool isUnclosedNode(const Node&) const;
</del><ins>+ bool isClosedShadowHidden(const Node&) const;
</ins><span class="cx">
</span><span class="cx"> HTMLSlotElement* assignedSlot() const;
</span><span class="cx"> HTMLSlotElement* assignedSlotForBindings() const;
</span></span></pre>
</div>
</div>
</body>
</html>