From b4cc543b6c1e3e3e42c1084d7edcc55059ee5e1d Mon Sep 17 00:00:00 2001 From: Anne van Kesteren Date: Thu, 17 Mar 2016 09:16:29 +0100 Subject: [PATCH] Editorial: shadow-including rather than shadow-root-including See https://github.com/w3c/webcomponents/issues/438 for discussion with Hayato. --- dom.bs | 35 ++++++++++++++++------------------- dom.html | 23 +++++++++++------------ 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/dom.bs b/dom.bs index 49f633347..358c7fab2 100644 --- a/dom.bs +++ b/dom.bs @@ -1598,9 +1598,9 @@ into a parent before a child, with an optional

  • Insert node into parent before child or at the end of parent if child is null. -

  • For each shadow-root-including inclusive descendant inclusiveDescendant - of node, in shadow-root-including tree order, run the insertion steps - with inclusiveDescendant. +

  • For each shadow-including inclusive descendant inclusiveDescendant of + node, in shadow-including tree order, run the insertion steps with + inclusiveDescendant.

  • If suppress observers flag is unset, @@ -1848,9 +1848,8 @@ steps:

  • Run the removing steps with node and parent. -

  • For each shadow-root-including descendant descendant of node, - in shadow-root-including tree order, run the removing steps with - descendant. +

  • For each shadow-including descendant descendant of node, in + shadow-including tree order, run the removing steps with descendant.

  • For each inclusive ancestor inclusiveAncestor of parent, if inclusiveAncestor has any registered observers @@ -4998,26 +4997,24 @@ interface ShadowRoot : DocumentFragment {
    -

    In -shadow-root-including tree order, is -shadow-root-including preorder, depth-first traversal of a tree. -shadow-root-including preorder, depth-first traversal of a tree +

    In shadow-including tree order, is +shadow-including preorder, depth-first traversal of a tree. +shadow-including preorder, depth-first traversal of a tree tree is preorder, depth-first traversal of tree, with for each element element encountered in tree, whose -shadow root is non-null, -shadow-root-including preorder, depth-first traversal of the element's -shadow root's tree just after it is encountered. +shadow root is non-null, shadow-including preorder, depth-first traversal +of the element's shadow root's tree just after it is +encountered.

    An object A is a -shadow-root-including descendant of an -object B, if A is a descendant of B, or A's +shadow-including descendant of an object +B, if A is a descendant of B, or A's root is a shadow root and A's root's -host is a shadow-root-including inclusive descendant of -B. +host is a shadow-including inclusive descendant of B.

    A -shadow-root-including inclusive descendant -is an object or one of its shadow-root-including descendants. +shadow-including inclusive descendant +is an object or one of its shadow-including descendants.

    diff --git a/dom.html b/dom.html index 073fd6488..3a71499da 100644 --- a/dom.html +++ b/dom.html @@ -69,7 +69,7 @@

    DOM

    -

    Living Standard — Last Updated

    +

    Living Standard — Last Updated

    Participate: @@ -1076,7 +1076,7 @@

    Insert node into parent before child or at the end of parent if child is null.

  • -

    For each shadow-root-including inclusive descendant inclusiveDescendant of node, in shadow-root-including tree order, run the insertion steps with inclusiveDescendant.

    +

    For each shadow-including inclusive descendant inclusiveDescendant of node, in shadow-including tree order, run the insertion steps with inclusiveDescendant.

  • If suppress observers flag is unset, queue a mutation record of "childList" for parent with addedNodes nodes, nextSibling child, and previousSibling child’s previous sibling or parent’s last child if child is null. @@ -1166,8 +1166,7 @@

    Run the removing steps with node and parent.

  • -

    For each shadow-root-including descendant descendant of node, - in shadow-root-including tree order, run the removing steps with descendant.

    +

    For each shadow-including descendant descendant of node, in shadow-including tree order, run the removing steps with descendant.

  • For each inclusive ancestor inclusiveAncestor of parent, if inclusiveAncestor has any registered observers whose options' subtree is true, then for each such registered observer registered, append a transient registered observer whose observer and options are identical to those of registered and source which is registered to node’s list of registered observers.
  • If suppress observers flag is unset, queue a mutation record of "childList" for parent with removedNodes a list solely containing node, @@ -2780,10 +2779,10 @@

    Shadow roots have an associated encapsulation mode ("open" or "closed").

    The host attribute’s getter must return the context object’s host.

    -

    In shadow-root-including tree order, is shadow-root-including preorder, depth-first traversal of a tree. shadow-root-including preorder, depth-first traversal of a tree tree is preorder, depth-first traversal of tree, with for each element element encountered in tree, whose shadow root is non-null, shadow-root-including preorder, depth-first traversal of the element’s shadow root’s tree just after it is encountered.

    -

    An object A is a shadow-root-including descendant of an -object B, if A is a descendant of B, or A’s root is a shadow root and A’s root’s host is a shadow-root-including inclusive descendant of B.

    -

    A shadow-root-including inclusive descendant is an object or one of its shadow-root-including descendants.

    +

    In shadow-including tree order, is shadow-including preorder, depth-first traversal of a tree. shadow-including preorder, depth-first traversal of a tree tree is preorder, depth-first traversal of tree, with for each element element encountered in tree, whose shadow root is non-null, shadow-including preorder, depth-first traversal of the element’s shadow root’s tree just after it is +encountered.

    +

    An object A is a shadow-including descendant of an object B, if A is a descendant of B, or A’s root is a shadow root and A’s root’s host is a shadow-including inclusive descendant of B.

    +

    A shadow-including inclusive descendant is an object or one of its shadow-including descendants.

    For now you can find more information about this object in Shadow DOM. The DOM Standard will be updated over time to cover more details.

    @@ -5459,6 +5458,10 @@

    set the end, in §5.2
  • set the start, in §5.2
  • setUserData(), in §8.2 +
  • shadow-including descendant, in §4.8 +
  • shadow-including inclusive descendant, in §4.8 +
  • shadow-including preorder, depth-first traversal, in §4.8 +
  • shadow-including tree order, in §4.8
  • ShadowRoot, in §4.8
  • shadow root @@ -5467,10 +5470,6 @@

    dfn for Element, in §4.9
  • shadowRoot, in §4.9 -
  • shadow-root-including descendant, in §4.8 -
  • shadow-root-including inclusive descendant, in §4.8 -
  • shadow-root-including preorder, depth-first traversal, in §4.8 -
  • shadow-root-including tree order, in §4.8
  • ShadowRootInit, in §4.9
  • ShadowRootMode, in §4.9
  • SHOW_ALL, in §6.3