correct shadow root registry inheritance and constructor map

Author: annevk

source

@@ -3203,7 +3203,7 @@ a.setAttribute('href', 'https://example.com/'); // change the content attribute
      <li><dfn data-x-href="https://dom.spec.whatwg.org/#concept-node-document">node document</dfn> concept</li>
      <li><dfn data-x="concept-document-type" data-x-href="https://dom.spec.whatwg.org/#concept-document-type">document type</dfn> concept</li>
      <li><dfn data-x="concept-DocumentFragment-host" data-x-href="https://dom.spec.whatwg.org/#concept-documentfragment-host">host</dfn> concept</li>
-     <li>The <dfn data-x-href="https://dom.spec.whatwg.org/#concept-shadow-root">shadow root</dfn> concept, and its <dfn data-x-href="https://dom.spec.whatwg.org/#shadowroot-delegates-focus">delegates focus</dfn>, <dfn data-x-href="https://dom.spec.whatwg.org/#shadowroot-available-to-element-internals">available to element internals</dfn>, <dfn data-x-href="https://dom.spec.whatwg.org/#shadowroot-clonable">clonable</dfn>, <dfn data-x="shadow-serializable" data-x-href="https://dom.spec.whatwg.org/#shadowroot-serializable">serializable</dfn>, and <dfn data-x="shadow-root-custom-element-registry" data-x-href="https://whatpr.org/dom/1341.html#shadowroot-custom-element-registry">custom element registry</dfn>.</li>
+     <li>The <dfn data-x-href="https://dom.spec.whatwg.org/#concept-shadow-root">shadow root</dfn> concept, and its <dfn data-x-href="https://dom.spec.whatwg.org/#shadowroot-delegates-focus">delegates focus</dfn>, <dfn data-x-href="https://dom.spec.whatwg.org/#shadowroot-available-to-element-internals">available to element internals</dfn>, <dfn data-x-href="https://dom.spec.whatwg.org/#shadowroot-clonable">clonable</dfn>, <dfn data-x="shadow-serializable" data-x-href="https://dom.spec.whatwg.org/#shadowroot-serializable">serializable</dfn>, <dfn data-x="shadow-root-custom-element-registry" data-x-href="https://whatpr.org/dom/1341.html#shadowroot-custom-element-registry">custom element registry</dfn>, and <dfn data-x="https://whatpr.org/dom/1341.html#shadowroot-keep-custom-element-registry-null">keep custom element registry null</dfn>.</li>
      <!-- XXX xref -->
      <li>The <dfn data-x-href="https://dom.spec.whatwg.org/#element-shadow-host">shadow host</dfn> concept</li>
      <li><dfn data-x-href="https://dom.spec.whatwg.org/#interface-htmlcollection"><code>HTMLCollection</code></dfn> interface, its
@@ -12071,14 +12071,14 @@ document.createElement("bad-1");  // (2)</code></pre>
    <li><p>Let <var>registry</var> be null.</p></li>
 
    <li>
-    <p>If <span>current global object</span>'s <span>active custom element constructor
+    <p>If the <span>surrounding agent</span>'s <span>active custom element constructor
     map</span>[<span>NewTarget</span>] <span data-x="map exists">exists</span>:</p>
 
     <ol>
-     <li><p>Set <var>registry</var> to <span>current global object</span>'s <span>active custom
+     <li><p>Set <var>registry</var> to the <span>surrounding agent</span>'s <span>active custom
      element constructor map</span>[<span>NewTarget</span>].</p></li>
 
-     <li><p><span data-x="map remove">Remove</span> <span>current global object</span>'s
+     <li><p><span data-x="map remove">Remove</span> the <span>surrounding agent</span>'s
      <span>active custom element constructor map</span>[<span>NewTarget</span>].</p></li>
     </ol>
 
@@ -72692,9 +72692,9 @@ document.body.append(parent);
 
   <div w-nodev>
 
-  <p>Each <code>Window</code> object has an associated <dfn export for="Window">active custom
-  element constructor map</dfn>, which is a <span data-x="ordered map">map</span> of constructors to
-  <code>CustomElementRegistry</code> objects.</p>
+  <p>Each <span>similar-origin window agent</span> has an associated <dfn export for="similar-origin
+  window agent">active custom element constructor map</dfn>, which is a <span data-x="ordered
+  map">map</span> of constructors to <code>CustomElementRegistry</code> objects.</p>
 
   <p>The <dfn attribute for="Window"><code
   data-x="dom-window-customElements">customElements</code></dfn> attribute of the
@@ -72711,8 +72711,8 @@ interface <dfn interface>CustomElementRegistry</dfn> {
   <span data-x="idl-Promise">Promise</span>&lt;<span>CustomElementConstructor</span>&gt; <span data-x="dom-CustomElementRegistry-whenDefined">whenDefined</span>(DOMString <var>name</var>);
   [<span>CEReactions</span>] undefined <span data-x="dom-CustomElementRegistry-upgrade">upgrade</span>(<span>Node</span> <var>root</var>);
 
-  <span>HTMLElement</span> <span data-x="dom-CustomElementRegistry-createElement">createElement</span>(DOMString <var>name</var>);
-  <span>Node</span> <span data-x="dom-CustomElementRegistry-cloneSubtree">cloneSubtree</span>(<span>Node</span> <var>root</var>);
+  [<span>CEReactions</span>, NewObject] <span>HTMLElement</span> <span data-x="dom-CustomElementRegistry-createElement">createElement</span>(DOMString <var>name</var>);
+  [<span>CEReactions</span>, NewObject] <span>Node</span> <span data-x="dom-CustomElementRegistry-cloneSubtree">cloneSubtree</span>(<span>Node</span> <var>root</var>);
 };
 
 callback <dfn callback>CustomElementConstructor</dfn> = <span>HTMLElement</span> ();
@@ -73253,9 +73253,8 @@ customElements.define("x-foo", class extends HTMLElement {
    <li><p>Let <var>registry</var> be <var>element</var>'s <span
    data-x="element-custom-element-registry">custom element registry</span>.</p></li>
 
-   <li><p><span data-x="map set">Set</span> <var>registry</var>'s <span>relevant global
-   object</span>'s <span>active custom element constructor map</span>[<var>C</var>] to
-   <var>registry</var>.</p></li>
+   <li><p><span data-x="map set">Set</span> the <span>surrounding agent</span>'s <span>active custom
+   element constructor map</span>[<var>C</var>] to <var>registry</var>.</p></li>
 
    <li>
     <p>Run the following steps while catching any exceptions:</p>
@@ -130231,13 +130230,6 @@ document.body.appendChild(text);
      data-x="attr-template-shadowrootdelegatesfocus">shadowrootdelegatesfocus</code> attribute;
      otherwise false.</p></li>
 
-     <li><p>Let <var>registry</var> be <var>declarative shadow host element</var>'s <span
-     data-x="element-custom-element-registry">custom element registry</span>.</p></li>
-
-     <li><p>If <var>template start tag</var> has a <code
-     data-x="attr-template-shadowrootcustomelementregistry">shadowrootcustomelementregistry</code>
-     attribute, then set <var>registry</var> to null.</p></li>
-
      <li><p>If <var>declarative shadow host element</var> is a <span>shadow host</span>, then
      <span>insert an element at the adjusted insertion location</span> with
      <var>template</var>.</p></li>
@@ -130274,6 +130266,11 @@ document.body.appendChild(text);
        <var>shadow</var>.</p></li>
 
        <li><p>Set <var>shadow</var>'s <span>available to element internals</span> to true.</p></li>
+
+       <li><p>If <var>template start tag</var> has a <code
+       data-x="attr-template-shadowrootcustomelementregistry">shadowrootcustomelementregistry</code>
+       attribute, then set <var>shadow</var>'s <span>keep custom element registry null</span> to
+       true.</p></li>
       </ol>
      </li>
     </ol>