attachShadow() should use the global registry by default

annevk · annevk · commit 281b5a9d7bc5 · 2025-10-04T03:19:49.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=300027 Reviewed by Ryosuke Niwa. Address whatwg/dom#1407 by partially reverting 296896@main. Canonical link: https://commits.webkit.org/300996@main
diff --git a/LayoutTests/imported/w3c/web-platform-tests/custom-elements/registries/ShadowRoot-init-customElementRegistry-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/custom-elements/registries/ShadowRoot-init-customElementRegistry-expected.txt
@@ -3,7 +3,7 @@ PASS A newly attached disconnected ShadowRoot should use the global registry by
 PASS A newly attached connected ShadowRoot should use the global registry by default
 PASS A newly attached disconnected ShadowRoot should use the scoped registry if explicitly specified in attachShadow
 PASS A newly attached connected ShadowRoot should use the scoped registry if explicitly specified in attachShadow
-PASS attachShadow() should use the global registry when customElementRegistry is null
-PASS attachShadow() should use the shadow host's registry when customElementRegistry is null
+PASS attachShadow() should use the global registry when customElementRegistry is null (host uses global registry)
+PASS attachShadow() should use the global registry when customElementRegistry is null (host uses custom registry)
 PASS attachShadow() should use the null registry when the shadow host uses null registry and customElementRegistry is null
 
diff --git a/LayoutTests/imported/w3c/web-platform-tests/custom-elements/registries/ShadowRoot-init-customElementRegistry.html b/LayoutTests/imported/w3c/web-platform-tests/custom-elements/registries/ShadowRoot-init-customElementRegistry.html
@@ -37,14 +37,14 @@
     const host = document.body.appendChild(document.createElement('div'));
     const shadowRoot = host.attachShadow({mode: 'closed', customElementRegistry: null});
     assert_equals(shadowRoot.customElementRegistry, window.customElements);
-}, 'attachShadow() should use the global registry when customElementRegistry is null');
+}, 'attachShadow() should use the global registry when customElementRegistry is null (host uses global registry)');
 
 test(() => {
     const registry = new CustomElementRegistry;
     const host = document.body.appendChild(document.createElement('div', {customElementRegistry: registry}));
     const shadowRoot = host.attachShadow({mode: 'closed', customElementRegistry: null});
-    assert_equals(shadowRoot.customElementRegistry, registry);
-}, 'attachShadow() should use the shadow host\'s registry when customElementRegistry is null');
+    assert_equals(shadowRoot.customElementRegistry, window.customElements);
+}, 'attachShadow() should use the global registry when customElementRegistry is null (host uses custom registry)');
 
 test(() => {
     const registry = new CustomElementRegistry;
diff --git a/LayoutTests/imported/w3c/web-platform-tests/custom-elements/registries/ShadowRoot-init-declarative-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/custom-elements/registries/ShadowRoot-init-declarative-expected.txt
@@ -0,0 +1,4 @@
+
+PASS Custom element inside 'shadowrootcustomelementregistry' declarative shadow root
+FAIL Built-in element inside 'shadowrootcustomelementregistry' declarative shadow root assert_equals: expected null but got object "[object CustomElementRegistry]"
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/custom-elements/registries/ShadowRoot-init-declarative.html b/LayoutTests/imported/w3c/web-platform-tests/custom-elements/registries/ShadowRoot-init-declarative.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<title>Scoped Custom Element Registries: declarative shadow root</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="host">
+  <template shadowrootmode="open" shadowrootcustomelementregistry>
+    <custom-element></custom-element>
+    <div></div>
+  </template>
+</div>
+<script>
+test(() => {
+  const customElement = host.shadowRoot.firstElementChild;
+  assert_equals(customElement.customElementRegistry, null);
+  customElement.attachShadow({
+    mode: "open"
+  });
+  assert_equals(customElement.shadowRoot.customElementRegistry, null);
+}, "Custom element inside 'shadowrootcustomelementregistry' declarative shadow root");
+
+test(() => {
+  const divElement = host.shadowRoot.lastElementChild;
+  assert_equals(divElement.customElementRegistry, null);
+  divElement.attachShadow({
+    mode: "open"
+  });
+  assert_equals(divElement.shadowRoot.customElementRegistry, null);
+}, "Built-in element inside 'shadowrootcustomelementregistry' declarative shadow root");
+</script>
diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp
@@ -3428,7 +3428,7 @@ ExceptionOr<ShadowRoot&> Element::attachShadow(const ShadowRootInit& init, std::
         ASSERT(registryKind == CustomElementRegistryKind::Window);
         scopedRegistry = ShadowRootScopedCustomElementRegistry::Yes;
     } else
-        registry = CustomElementRegistry::registryForElement(*this);
+        registry = document().customElementRegistry();
     Ref shadow = ShadowRoot::create(document(), init.mode, init.slotAssignment,
         init.delegatesFocus ? ShadowRootDelegatesFocus::Yes : ShadowRootDelegatesFocus::No,
         init.clonable ? ShadowRoot::Clonable::Yes : ShadowRoot::Clonable::No,

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +PASS Custom element inside 'shadowrootcustomelementregistry' declarative shadow root
 +FAIL Built-in element inside 'shadowrootcustomelementregistry' declarative shadow root assert_equals: expected null but got object "[object CustomElementRegistry]"
++