<!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>[195682] 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/195682">195682</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-27 12:09:50 -0800 (Wed, 27 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add Node.treeRoot
https://bugs.webkit.org/show_bug.cgi?id=153537
Reviewed by Antti Koivisto.
Source/WebCore:
Exposed highestAncestor as Node.prototype.treeRoot, which was added to shadow DOM spec in
https://github.com/w3c/webcomponents/commit/6864a40fe4efa8a737e78512e3c85319ddc5bf8b
See also:
http://w3c.github.io/webcomponents/spec/shadow/#extensions-to-node-interface
Test: fast/shadow-dom/Node-interface-treeRoot.html
* dom/Node.idl:
LayoutTests:
Added a testharness.js test for Node.treeRoot. Also rebaselined a test.
* js/dom/dom-static-property-for-in-iteration-expected.txt: Rebaselined.
* fast/shadow-dom/Node-interface-treeRoot-expected.txt: Added.
* fast/shadow-dom/Node-interface-treeRoot.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsdomdomstaticpropertyforiniterationexpectedtxt">trunk/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomNodeidl">trunk/Source/WebCore/dom/Node.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomNodeinterfacetreeRootexpectedtxt">trunk/LayoutTests/fast/shadow-dom/Node-interface-treeRoot-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomNodeinterfacetreeRoothtml">trunk/LayoutTests/fast/shadow-dom/Node-interface-treeRoot.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195681 => 195682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-27 20:08:52 UTC (rev 195681)
+++ trunk/LayoutTests/ChangeLog 2016-01-27 20:09:50 UTC (rev 195682)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-01-26 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Add Node.treeRoot
+ https://bugs.webkit.org/show_bug.cgi?id=153537
+
+ Reviewed by Antti Koivisto.
+
+ Added a testharness.js test for Node.treeRoot. Also rebaselined a test.
+
+ * js/dom/dom-static-property-for-in-iteration-expected.txt: Rebaselined.
+ * fast/shadow-dom/Node-interface-treeRoot-expected.txt: Added.
+ * fast/shadow-dom/Node-interface-treeRoot.html: Added.
+
+2016-01-26 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Rename HTMLSlotElement.getDistributedNodes to getAssignedNodes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153534
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomNodeinterfacetreeRootexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/Node-interface-treeRoot-expected.txt (0 => 195682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/Node-interface-treeRoot-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/Node-interface-treeRoot-expected.txt 2016-01-27 20:09:50 UTC (rev 195682)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+
+PASS treeRoot attribute must be defined on Node interface
+PASS treeRoot attribute must return the context object when it does not have any parent
+PASS treeRoot attribute must return the parent node of the context object when the context object has a single ancestor not in a document
+PASS treeRoot attribute must return the document when a node is in document and not in a shadow tree
+PASS treeRoot attribute must return the open shadow root of the context object when the shadow host is in a document
+PASS treeRoot attribute must return the closed shadow root of the context object when the shadow host is in a document
+PASS treeRoot attribute must return the root node of the context object when the context object is inside a open shadow root whose shadow host is in another open shadow root
+PASS treeRoot attribute must return the root node of the context object when the context object is inside a closed shadow root whose shadow host is in another open shadow root
+PASS treeRoot attribute must return the root node of the context object when the context object is inside a open shadow root whose shadow host is in another closed shadow root
+PASS treeRoot attribute must return the root node of the context object when the context object is inside a closed shadow root whose shadow host is in another closed shadow root
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomNodeinterfacetreeRoothtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/Node-interface-treeRoot.html (0 => 195682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/Node-interface-treeRoot.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/Node-interface-treeRoot.html 2016-01-27 20:09:50 UTC (rev 195682)
</span><span class="lines">@@ -0,0 +1,150 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>Shadow DOM: Extensions to Node interface</title>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content="Node interface must have treeRoot attribute">
+<link rel="help" href="http://w3c.github.io/webcomponents/spec/shadow/#extensions-to-node-interface">
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<link rel='stylesheet' href='../../resources/testharness.css'>
+</head>
+<body>
+<div id="log"></div>
+<script>
+
+test(function () {
+ assert_true('treeRoot' in Node.prototype, 'treeRoot must be defined on Node.prototype');
+ assert_true('treeRoot' in document.createElement('div'), 'treeRoot must be defined on a div element');
+ assert_true('treeRoot' in document.createTextNode(''), 'assignedSlot must be defined on a text node');
+ assert_true('treeRoot' in document.createComment(''), 'assignedSlot must be defined on a comment node');
+ assert_true('treeRoot' in document.createProcessingInstruction('target', 'data'), 'assignedSlot must be defined on a processing instruction node');
+ assert_true('treeRoot' in document, 'assignedSlot must be defined on a document node');
+ assert_true('treeRoot' in document.createElement('div').attachShadow({mode: 'closed'}), 'treeRoot must be defined on a closed shadow root element');
+ assert_true('treeRoot' in document.createElement('div').attachShadow({mode: 'open'}), 'treeRoot must be defined on a open shadow root element');
+}, 'treeRoot attribute must be defined on Node interface');
+
+test(function () {
+ var element = document.createElement('div');
+ assert_equals(element.treeRoot, element, 'treeRoot on an element without a parent must return the element itself');
+
+ var text = document.createTextNode('');
+ assert_equals(text.treeRoot, text, 'treeRoot on a text node without a parent must return the text node itself');
+
+ var processingInstruction = document.createProcessingInstruction('target', 'data');
+ assert_equals(processingInstruction.treeRoot, processingInstruction, 'treeRoot on a processing instruction node without a parent must return the processing instruction node itself');
+
+ assert_equals(document.treeRoot, document, 'treeRoot on a document node must return the document itself');
+
+ var closedShadowRoot = document.createElement('div').attachShadow({mode: 'closed'});
+ assert_equals(closedShadowRoot.treeRoot, closedShadowRoot, 'treeRoot on a closed shadow root must return the shadow root itself');
+
+ var openShadowRoot = document.createElement('div').attachShadow({mode: 'open'});
+ assert_equals(openShadowRoot.treeRoot, openShadowRoot, 'treeRoot on a open shadow root must return the shadow root itself');
+}, 'treeRoot attribute must return the context object when it does not have any parent');
+
+test(function () {
+ var parent = document.createElement('div');
+
+ var element = document.createElement('div');
+ parent.appendChild(element);
+ assert_equals(element.treeRoot, parent, 'treeRoot on an element with a single ancestor must return the parent node');
+
+ var text = document.createTextNode('');
+ parent.appendChild(text);
+ assert_equals(text.treeRoot, parent, 'treeRoot on a text node with a single ancestor must return the parent node');
+
+ var processingInstruction = document.createProcessingInstruction('target', 'data');
+ parent.appendChild(processingInstruction)
+ assert_equals(processingInstruction.treeRoot, parent, 'treeRoot on a processing instruction node with a single ancestor must return the parent node');
+
+ var hostWithClosedShadowRoot = document.createElement('div');
+ parent.appendChild(hostWithClosedShadowRoot);
+ var closedShadowRoot = hostWithClosedShadowRoot.attachShadow({mode: 'closed'});
+ assert_equals(closedShadowRoot.treeRoot, closedShadowRoot, 'treeRoot on a closed shadow root with a single ancestor on its host must return the shadow root itself');
+
+ var hostWithOpenShadowRoot = document.createElement('div');
+ parent.appendChild(hostWithOpenShadowRoot);
+ var openShadowRoot = hostWithOpenShadowRoot.attachShadow({mode: 'open'});
+ assert_equals(openShadowRoot.treeRoot, openShadowRoot, 'treeRoot on a open shadow root with a single ancestor on its host must return the shadow root itself');
+}, 'treeRoot attribute must return the parent node of the context object when the context object has a single ancestor not in a document');
+
+test(function () {
+ var parent = document.createElement('div');
+ document.body.appendChild(parent);
+
+ var element = document.createElement('div');
+ parent.appendChild(element);
+ assert_equals(element.treeRoot, document, 'treeRoot on an element inside a document must return the document');
+
+ var text = document.createTextNode('');
+ parent.appendChild(text);
+ assert_equals(text.treeRoot, document, 'treeRoot on a text node inside a document must return the document');
+
+ var processingInstruction = document.createProcessingInstruction('target', 'data');
+ parent.appendChild(processingInstruction)
+ assert_equals(processingInstruction.treeRoot, document, 'treeRoot on a processing instruction node inside a document must return the document');
+}, 'treeRoot attribute must return the document when a node is in document and not in a shadow tree');
+
+function testTreeRootOnNodeInsideShadowTree(mode) {
+ test(function () {
+ var host = document.createElement('div');
+ document.body.appendChild(host);
+
+ var shadowRoot = host.attachShadow({mode: mode});
+ var parent = document.createElement('p');
+ shadowRoot.appendChild(parent);
+
+ var element = document.createElement('span');
+ parent.appendChild(element);
+ assert_equals(element.treeRoot, shadowRoot, 'treeRoot on an element inside a shadow tree must return the shadow root');
+
+ var text = document.createTextNode('');
+ parent.appendChild(text);
+ assert_equals(text.treeRoot, shadowRoot, 'treeRoot on a text node inside a shadow tree must return the shadow root');
+
+ var processingInstruction = document.createProcessingInstruction('target', 'data');
+ parent.appendChild(processingInstruction);
+ assert_equals(processingInstruction.treeRoot, shadowRoot, 'treeRoot on a processing instruction node inside a shadow tree must return the shadow root');
+ }, 'treeRoot attribute must return the ' + mode + ' shadow root of the context object when the shadow host is in a document');
+}
+
+testTreeRootOnNodeInsideShadowTree('open');
+testTreeRootOnNodeInsideShadowTree('closed');
+
+function testTreeRootOnNodeInsideNestedShadowTree(outerMode, innerMode) {
+ test(function () {
+ var outerHost = document.createElement('div');
+ document.body.appendChild(outerHost);
+ var outerShadowRoot = outerHost.attachShadow({mode: outerMode});
+
+ var innerHost = document.createElement('section');
+ outerShadowRoot.appendChild(innerHost);
+ var innerShadowRoot = innerHost.attachShadow({mode: innerMode});
+
+ var parent = document.createElement('p');
+ innerShadowRoot.appendChild(parent);
+
+ var element = document.createElement('span');
+ parent.appendChild(element);
+ assert_equals(element.treeRoot, innerShadowRoot, 'treeRoot on an element inside a shadow tree must return its root node');
+
+ var text = document.createTextNode('');
+ parent.appendChild(text);
+ assert_equals(text.treeRoot, innerShadowRoot, 'treeRoot on a text node inside a shadow tree must return its root node');
+
+ var processingInstruction = document.createProcessingInstruction('target', 'data');
+ parent.appendChild(processingInstruction);
+ assert_equals(processingInstruction.treeRoot, innerShadowRoot, 'treeRoot on a processing instruction node inside a shadow tree must return its root node');
+ }, 'treeRoot attribute must return the root node of the context object when the context object is inside a ' + innerMode
+ + ' shadow root whose shadow host is in another ' + outerMode + ' shadow root');
+}
+
+testTreeRootOnNodeInsideNestedShadowTree('open', 'open');
+testTreeRootOnNodeInsideNestedShadowTree('open', 'closed');
+testTreeRootOnNodeInsideNestedShadowTree('closed', 'open');
+testTreeRootOnNodeInsideNestedShadowTree('closed', 'closed');
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsdomdomstaticpropertyforiniterationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt (195681 => 195682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt 2016-01-27 20:08:52 UTC (rev 195681)
+++ trunk/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt 2016-01-27 20:09:50 UTC (rev 195682)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> PASS a["previousSibling"] is [object Text]
</span><span class="cx"> PASS a["nextSibling"] is [object Text]
</span><span class="cx"> PASS a["ownerDocument"] is [object HTMLDocument]
</span><ins>+PASS a["treeRoot"] is [object HTMLDocument]
</ins><span class="cx"> PASS a["namespaceURI"] is http://www.w3.org/1999/xhtml
</span><span class="cx"> PASS a["prefix"] is null
</span><span class="cx"> PASS a["localName"] is a
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195681 => 195682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-27 20:08:52 UTC (rev 195681)
+++ trunk/Source/WebCore/ChangeLog 2016-01-27 20:09:50 UTC (rev 195682)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-01-26 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Add Node.treeRoot
+ https://bugs.webkit.org/show_bug.cgi?id=153537
+
+ Reviewed by Antti Koivisto.
+
+ Exposed highestAncestor as Node.prototype.treeRoot, which was added to shadow DOM spec in
+ https://github.com/w3c/webcomponents/commit/6864a40fe4efa8a737e78512e3c85319ddc5bf8b
+
+ See also:
+ http://w3c.github.io/webcomponents/spec/shadow/#extensions-to-node-interface
+
+ Test: fast/shadow-dom/Node-interface-treeRoot.html
+
+ * dom/Node.idl:
+
+2016-01-26 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Rename HTMLSlotElement.getDistributedNodes to getAssignedNodes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153534
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.idl (195681 => 195682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.idl 2016-01-27 20:08:52 UTC (rev 195681)
+++ trunk/Source/WebCore/dom/Node.idl 2016-01-27 20:09:50 UTC (rev 195682)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx"> readonly attribute Node nextSibling;
</span><span class="cx"> readonly attribute Document ownerDocument;
</span><span class="cx">
</span><ins>+ [Conditional=SHADOW_DOM, ImplementedAs=highestAncestor] readonly attribute Node treeRoot;
+
</ins><span class="cx"> [ObjCLegacyUnnamedParameters, Custom, RaisesException] Node insertBefore([CustomReturn] Node newChild,
</span><span class="cx"> Node refChild);
</span><span class="cx"> [ObjCLegacyUnnamedParameters, Custom, RaisesException] Node replaceChild(Node newChild,
</span></span></pre>
</div>
</div>
</body>
</html>