mirror of
https://github.com/servo/servo.git
synced 2025-08-05 05:30:08 +01:00
Register/unregister shadow roots in documents when they are connected
This commit is contained in:
parent
cd07574235
commit
18c1b8f690
2 changed files with 30 additions and 6 deletions
|
@ -377,6 +377,8 @@ pub struct Document {
|
||||||
delayed_tasks: DomRefCell<Vec<Box<dyn TaskBox>>>,
|
delayed_tasks: DomRefCell<Vec<Box<dyn TaskBox>>>,
|
||||||
/// https://html.spec.whatwg.org/multipage/#completely-loaded
|
/// https://html.spec.whatwg.org/multipage/#completely-loaded
|
||||||
completely_loaded: Cell<bool>,
|
completely_loaded: Cell<bool>,
|
||||||
|
/// List of shadow roots bound to the document tree.
|
||||||
|
shadow_roots: DomRefCell<Vec<Dom<ShadowRoot>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(JSTraceable, MallocSizeOf)]
|
#[derive(JSTraceable, MallocSizeOf)]
|
||||||
|
@ -2680,6 +2682,7 @@ impl Document {
|
||||||
completely_loaded: Cell::new(false),
|
completely_loaded: Cell::new(false),
|
||||||
script_and_layout_blockers: Cell::new(0),
|
script_and_layout_blockers: Cell::new(0),
|
||||||
delayed_tasks: Default::default(),
|
delayed_tasks: Default::default(),
|
||||||
|
shadow_roots: DomRefCell::new(Vec::new()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3132,6 +3135,20 @@ impl Document {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn register_shadow_root(&self, shadow_root: &ShadowRoot) {
|
||||||
|
self.shadow_roots
|
||||||
|
.borrow_mut()
|
||||||
|
.push(Dom::from_ref(shadow_root));
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn unregister_shadow_root(&self, shadow_root: &ShadowRoot) {
|
||||||
|
let mut shadow_roots = self.shadow_roots.borrow_mut();
|
||||||
|
let position = shadow_roots.iter().position(|sr| **sr == *shadow_root);
|
||||||
|
if let Some(index) = position {
|
||||||
|
shadow_roots.remove(index);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Element {
|
impl Element {
|
||||||
|
|
|
@ -486,9 +486,13 @@ impl Element {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Steps 4, 5 and 6.
|
// Steps 4, 5 and 6.
|
||||||
Ok(self
|
let shadow_root = self
|
||||||
.shadow_root
|
.shadow_root
|
||||||
.or_init(|| ShadowRoot::new(self, &*self.node.owner_doc())))
|
.or_init(|| ShadowRoot::new(self, &*self.node.owner_doc()));
|
||||||
|
|
||||||
|
self.node.owner_doc().register_shadow_root(&*shadow_root);
|
||||||
|
|
||||||
|
Ok(shadow_root)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2787,8 +2791,9 @@ impl VirtualMethods for Element {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.is_shadow_host() {
|
let doc = document_from_node(self);
|
||||||
let shadow_root = self.shadow_root.get().unwrap();
|
|
||||||
|
if let Some(shadow_root) = self.upcast::<Node>().owner_shadow_root() {
|
||||||
let shadow_root = shadow_root.upcast::<Node>();
|
let shadow_root = shadow_root.upcast::<Node>();
|
||||||
shadow_root.set_flag(NodeFlags::IS_CONNECTED, tree_connected);
|
shadow_root.set_flag(NodeFlags::IS_CONNECTED, tree_connected);
|
||||||
for node in shadow_root.children() {
|
for node in shadow_root.children() {
|
||||||
|
@ -2797,7 +2802,6 @@ impl VirtualMethods for Element {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let doc = document_from_node(self);
|
|
||||||
if let Some(ref value) = *self.id_attribute.borrow() {
|
if let Some(ref value) = *self.id_attribute.borrow() {
|
||||||
doc.register_named_element(self, value.clone());
|
doc.register_named_element(self, value.clone());
|
||||||
}
|
}
|
||||||
|
@ -2816,8 +2820,12 @@ impl VirtualMethods for Element {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let doc = document_from_node(self);
|
||||||
|
|
||||||
if self.is_shadow_host() {
|
if self.is_shadow_host() {
|
||||||
let shadow_root = self.shadow_root.get().unwrap();
|
let shadow_root = self.shadow_root.get().unwrap();
|
||||||
|
doc.unregister_shadow_root(&shadow_root);
|
||||||
|
let shadow_root = shadow_root.upcast::<Node>();
|
||||||
let shadow_root = shadow_root.upcast::<Node>();
|
let shadow_root = shadow_root.upcast::<Node>();
|
||||||
shadow_root.set_flag(NodeFlags::IS_CONNECTED, false);
|
shadow_root.set_flag(NodeFlags::IS_CONNECTED, false);
|
||||||
for node in shadow_root.children() {
|
for node in shadow_root.children() {
|
||||||
|
@ -2826,7 +2834,6 @@ impl VirtualMethods for Element {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let doc = document_from_node(self);
|
|
||||||
let fullscreen = doc.GetFullscreenElement();
|
let fullscreen = doc.GetFullscreenElement();
|
||||||
if fullscreen.deref() == Some(self) {
|
if fullscreen.deref() == Some(self) {
|
||||||
doc.exit_fullscreen();
|
doc.exit_fullscreen();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue