Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Ensure Element ID modifications inside disconnected shadow roots are registered (#34834)

Browse source 
* Add test for modifying element IDs in disconnected shadow roots

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

* Register element ID modifications inside disconnected shadow roots

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

* Don't crash when registering named elements in disconnected shadow roots

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

* Fix test title

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

---------

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
This commit is contained in:
Simon Wülker 2025-01-04 06:45:27 +01:00 • committed by GitHub
parent 1ab55e6b11
commit 75a22cfe2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/documentorshadowroot.rs
View file

@ -303,7 +303,7 @@ impl DocumentOrShadowRoot {
root: DomRoot<Node>, root: DomRoot<Node>,
) { ) {
debug!("Adding named element {:p}: {:p} id={}", self, element, id); debug!("Adding named element {:p}: {:p} id={}", self, element, id);
assert!(element.upcast::<Node>().is_connected()); assert!(element.upcast::<Node>().is_connected_to_tree());
assert!(!id.is_empty()); assert!(!id.is_empty());
let mut id_map = id_map.borrow_mut(); let mut id_map = id_map.borrow_mut();
let elements = id_map.entry(id.clone()).or_default(); let elements = id_map.entry(id.clone()).or_default();

3
components/script/dom/element.rs
View file

@ -3510,8 +3510,9 @@ impl VirtualMethods for Element {
None None
} }
}); });
let containing_shadow_root = self.containing_shadow_root(); let containing_shadow_root = self.containing_shadow_root();
if node.is_connected() { if node.is_connected_to_tree() {
let value = attr.value().as_atom().clone(); let value = attr.value().as_atom().clone();
match mutation { match mutation {
AttributeMutation::Set(old_value) => { AttributeMutation::Set(old_value) => {

7
tests/wpt/meta/MANIFEST.json vendored
View file

@ -766457,6 +766457,13 @@
{} {}
] ]
], ],
"getElementById-dynamic-002.html": [
"8fb1934c60753c39c081fa97987bbdf1cc68a521",
[
null,
{}
]
],
"historical.html": [ "historical.html": [
"4fa8be1dbc9537b904d51b74e8de37dc36a471d6", "4fa8be1dbc9537b904d51b74e8de37dc36a471d6",
[ [

20
tests/wpt/tests/shadow-dom/getElementById-dynamic-002.html vendored Normal file
View file

@ -0,0 +1,20 @@
<!doctype html>
<title>Shadow DOM: Modifying an element ID inside a disconnected shadow root does not break getElementById</title>
<link rel="help" href="https://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid">
<link rel="author" name="Simon Wülker">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<div id="host"></div>
<script>
test(function() {
let host = document.getElementById("host");
host.attachShadow({ mode: "open" }).innerHTML = `<div id="test-id"></div>`;
let element = host.shadowRoot.getElementById("test-id");
assert_true(!!element);
host.remove();
host.shadowRoot.getElementById("test-id").id = "new-id";
assert_equals(host.shadowRoot.getElementById("new-id"), element);
}, "ShadowRoot.getElementById works on elements whose id was modified after the root was disconnected");
</script>