Skip to content

Commit

Permalink
Editorial: define in a shadow-including document and shadow-including…
Browse files Browse the repository at this point in the history
… root

Fixes WICG/webcomponents#57.
  • Loading branch information
annevk committed Mar 22, 2016
1 parent e996bdc commit 7dae99c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
7 changes: 7 additions & 0 deletions dom.bs
Original file line number Diff line number Diff line change
Expand Up @@ -1458,6 +1458,9 @@ referred to as the <dfn export id=concept-light-tree>light tree</dfn>.</p>
<p class="note">A <a>shadow tree</a>'s corresponding <a>light tree</a> can be a <a>shadow tree</a>
itself.</p>

<p>An <a for=/>element</a> is <dfn export>in a shadow-including document</dfn> if its
<a>shadow-including root</a> is a <a>document</a>.

<h5 id=shadow-tree-slots>Slots</h5>

<p>A <a>shadow tree</a> contains zero or more <a for=/>elements</a> that are
Expand Down Expand Up @@ -5175,6 +5178,10 @@ or "<code>closed</code>").</p>
<a for=/>element</a>'s <a for=Element>shadow root</a>'s <a>node tree</a> just after it is
encountered.

<p>The <dfn export id=concept-shadow-including-root>shadow-including root</dfn> of an object is its
<a for=DocumentFragment>host</a>'s <a for=tree>root</a>, if the object is a
<a for=/>shadow root</a>, and its <a for=tree>root</a> otherwise.</p>

<p>An object <var>A</var> is a
<dfn export id=concept-shadow-including-descendant>shadow-including descendant</dfn> of an object
<var>B</var>, if <var>A</var> is a <a>descendant</a> of <var>B</var>, or <var>A</var>'s
Expand Down
6 changes: 5 additions & 1 deletion dom.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<div class="head">
<p data-fill-with="logo"><a class="logo" href="https://whatwg.org/"> <img alt="WHATWG" height="100" src="https://resources.whatwg.org/logo-dom.svg"> </a> </p>
<h1 class="p-name no-ref allcaps" id="title">DOM</h1>
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Living Standard — Last Updated <time class="dt-updated" datetime="2016-03-21">21 March 2016</time></span></h2>
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Living Standard — Last Updated <time class="dt-updated" datetime="2016-03-22">22 March 2016</time></span></h2>
<div data-fill-with="spec-metadata">
<dl>
<dt>Participate:
Expand Down Expand Up @@ -1032,6 +1032,7 @@ <h4 class="heading settled" data-level="4.2.2" id="shadow-trees"><span class="se
<p>A <a data-link-type="dfn" href="#concept-shadow-root">shadow root</a> is always connected to another <a data-link-type="dfn" href="#concept-node-tree">node tree</a> through its <a data-link-type="dfn" href="#concept-documentfragment-host">host</a>. A <a data-link-type="dfn" href="#concept-shadow-tree">shadow tree</a> is therefore never alone. The <a data-link-type="dfn" href="#concept-node-tree">node tree</a> of a <a data-link-type="dfn" href="#concept-shadow-root">shadow root</a>’s <a data-link-type="dfn" href="#concept-documentfragment-host">host</a> is sometimes
referred to as the <dfn data-dfn-type="dfn" data-export="" id="concept-light-tree">light tree<a class="self-link" href="#concept-light-tree"></a></dfn>.</p>
<p class="note" role="note">A <a data-link-type="dfn" href="#concept-shadow-tree">shadow tree</a>’s corresponding <a data-link-type="dfn" href="#concept-light-tree">light tree</a> can be a <a data-link-type="dfn" href="#concept-shadow-tree">shadow tree</a> itself.</p>
<p>An <a data-link-type="dfn" href="#concept-element">element</a> is <dfn data-dfn-type="dfn" data-export="" id="in-a-shadow-including-document">in a shadow-including document<a class="self-link" href="#in-a-shadow-including-document"></a></dfn> if its <a data-link-type="dfn" href="#concept-shadow-including-root">shadow-including root</a> is a <a data-link-type="dfn" href="#concept-document">document</a>. </p>
<h5 class="heading settled" data-level="4.2.2.1" id="shadow-tree-slots"><span class="secno">4.2.2.1. </span><span class="content">Slots</span><a class="self-link" href="#shadow-tree-slots"></a></h5>
<p>A <a data-link-type="dfn" href="#concept-shadow-tree">shadow tree</a> contains zero or more <a data-link-type="dfn" href="#concept-element">elements</a> that are <dfn data-dfn-type="dfn" data-export="" data-lt="slot" id="concept-slot">slots<a class="self-link" href="#concept-slot"></a></dfn>.</p>
<p class="note" role="note">A <a data-link-type="dfn" href="#concept-slot">slot</a> can only be created through HTML’s <code>slot</code> element.</p>
Expand Down Expand Up @@ -2894,6 +2895,7 @@ <h3 class="heading settled" data-level="4.8" id="interface-shadowroot"><span cla
<hr>
<p>In <dfn data-dfn-type="dfn" data-export="" id="concept-shadow-including-tree-order">shadow-including tree order<a class="self-link" href="#concept-shadow-including-tree-order"></a></dfn>, is <a data-link-type="dfn" href="#shadow-including-preorder-depth-first-traversal">shadow-including preorder, depth-first traversal</a> of a <a data-link-type="dfn" href="#concept-node-tree">node tree</a>. <dfn data-dfn-type="dfn" data-noexport="" id="shadow-including-preorder-depth-first-traversal">shadow-including preorder, depth-first traversal<a class="self-link" href="#shadow-including-preorder-depth-first-traversal"></a></dfn> of a <a data-link-type="dfn" href="#concept-node-tree">node tree</a> <var>tree</var> is preorder, depth-first traversal of <var>tree</var>, with for each <a data-link-type="dfn" href="#concept-element">element</a> <var>element</var> encountered in <var>tree</var> with a non-null <a data-link-type="dfn" href="#concept-element-shadow-root">shadow root</a>, <a data-link-type="dfn" href="#shadow-including-preorder-depth-first-traversal">shadow-including preorder, depth-first traversal</a> of that <a data-link-type="dfn" href="#concept-element">element</a>’s <a data-link-type="dfn" href="#concept-element-shadow-root">shadow root</a>’s <a data-link-type="dfn" href="#concept-node-tree">node tree</a> just after it is
encountered. </p>
<p>The <dfn data-dfn-type="dfn" data-export="" id="concept-shadow-including-root">shadow-including root<a class="self-link" href="#concept-shadow-including-root"></a></dfn> of an object is its <a data-link-type="dfn" href="#concept-documentfragment-host">host</a>’s <a data-link-type="dfn" href="#concept-tree-root">root</a>, if the object is a <a data-link-type="dfn" href="#concept-shadow-root">shadow root</a>, and its <a data-link-type="dfn" href="#concept-tree-root">root</a> otherwise.</p>
<p>An object <var>A</var> is a <dfn data-dfn-type="dfn" data-export="" id="concept-shadow-including-descendant">shadow-including descendant<a class="self-link" href="#concept-shadow-including-descendant"></a></dfn> of an object <var>B</var>, if <var>A</var> is a <a data-link-type="dfn" href="#concept-tree-descendant">descendant</a> of <var>B</var>, or <var>A</var>’s <a data-link-type="dfn" href="#concept-tree-root">root</a> is a <a data-link-type="dfn" href="#concept-shadow-root">shadow root</a> and <var>A</var>’s <a data-link-type="dfn" href="#concept-tree-root">root</a>’s <a data-link-type="dfn" href="#concept-documentfragment-host">host</a> is a <a data-link-type="dfn" href="#concept-shadow-including-inclusive-descendant">shadow-including inclusive descendant</a> of <var>B</var>. </p>
<p>A <dfn data-dfn-type="dfn" data-export="" id="concept-shadow-including-inclusive-descendant">shadow-including inclusive descendant<a class="self-link" href="#concept-shadow-including-inclusive-descendant"></a></dfn> is an object or one of its <a data-link-type="dfn" href="#concept-shadow-including-descendant">shadow-including descendants</a>. </p>
<hr>
Expand Down Expand Up @@ -5238,6 +5240,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-here"><span class="c
<li><a href="#dom-document-importnode">importNode(node)</a><span>, in §4.5</span>
<li><a href="#dom-document-importnode">importNode(node, deep)</a><span>, in §4.5</span>
<li><a href="#in-a-document">in a document</a><span>, in §4.2.1</span>
<li><a href="#in-a-shadow-including-document">in a shadow-including document</a><span>, in §4.2.2</span>
<li><a href="#concept-tree-inclusive-ancestor">inclusive ancestor</a><span>, in §2.1</span>
<li><a href="#concept-tree-inclusive-descendant">inclusive descendant</a><span>, in §2.1</span>
<li><a href="#concept-tree-inclusive-sibling">inclusive sibling</a><span>, in §2.1</span>
Expand Down Expand Up @@ -5575,6 +5578,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-here"><span class="c
<li><a href="#concept-shadow-including-descendant">shadow-including descendant</a><span>, in §4.8</span>
<li><a href="#concept-shadow-including-inclusive-descendant">shadow-including inclusive descendant</a><span>, in §4.8</span>
<li><a href="#shadow-including-preorder-depth-first-traversal">shadow-including preorder, depth-first traversal</a><span>, in §4.8</span>
<li><a href="#concept-shadow-including-root">shadow-including root</a><span>, in §4.8</span>
<li><a href="#concept-shadow-including-tree-order">shadow-including tree order</a><span>, in §4.8</span>
<li><a href="#shadowroot">ShadowRoot</a><span>, in §4.8</span>
<li>
Expand Down

0 comments on commit 7dae99c

Please sign in to comment.