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

Tweak list of shadow roots attached to doc

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2019-03-06 18:02:10 +01:00
parent b8925a0297
commit 0313e38074
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/layout_thread/dom_wrapper.rs
View file

@ -430,7 +430,10 @@ impl<'ld> ServoLayoutDocument<'ld> {
self.document self.document
.shadow_roots() .shadow_roots()
.iter() .iter()
.map(|sr| ServoShadowRoot::from_layout_js(*sr)) .map(|sr| {
debug_assert!(sr.upcast::<Node>().get_flag(NodeFlags::IS_CONNECTED));
ServoShadowRoot::from_layout_js(*sr)
})
.collect() .collect()
} }
} }

11
components/script/dom/document.rs
View file

@ -377,7 +377,7 @@ pub struct Document {
/// 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. /// List of shadow roots bound to the document tree.
shadow_roots: DomRefCell<Vec<Dom<ShadowRoot>>>, shadow_roots: DomRefCell<HashSet<Dom<ShadowRoot>>>,
/// Whether any of the shadow roots need the stylesheets flushed. /// Whether any of the shadow roots need the stylesheets flushed.
shadow_roots_styles_changed: Cell<bool>, shadow_roots_styles_changed: Cell<bool>,
} }
@ -2674,7 +2674,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()), shadow_roots: DomRefCell::new(HashSet::new()),
shadow_roots_styles_changed: Cell::new(false), shadow_roots_styles_changed: Cell::new(false),
} }
} }
@ -3132,16 +3132,13 @@ impl Document {
pub fn register_shadow_root(&self, shadow_root: &ShadowRoot) { pub fn register_shadow_root(&self, shadow_root: &ShadowRoot) {
self.shadow_roots self.shadow_roots
.borrow_mut() .borrow_mut()
.push(Dom::from_ref(shadow_root)); .insert(Dom::from_ref(shadow_root));
self.invalidate_shadow_roots_stylesheets(); self.invalidate_shadow_roots_stylesheets();
} }
pub fn unregister_shadow_root(&self, shadow_root: &ShadowRoot) { pub fn unregister_shadow_root(&self, shadow_root: &ShadowRoot) {
let mut shadow_roots = self.shadow_roots.borrow_mut(); let mut shadow_roots = self.shadow_roots.borrow_mut();
let position = shadow_roots.iter().position(|sr| **sr == *shadow_root); shadow_roots.remove(&Dom::from_ref(shadow_root));
if let Some(index) = position {
shadow_roots.remove(index);
}
} }
pub fn invalidate_shadow_roots_stylesheets(&self) { pub fn invalidate_shadow_roots_stylesheets(&self) {

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

@ -489,7 +489,9 @@ impl Element {
.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); if self.is_connected() {
self.node.owner_doc().register_shadow_root(&*shadow_root);
}
Ok(shadow_root) Ok(shadow_root)
} }
@ -2802,7 +2804,10 @@ impl VirtualMethods for Element {
f.bind_form_control_to_tree(); f.bind_form_control_to_tree();
} }
let doc = document_from_node(self);
if let Some(shadow_root) = self.rare_data.shadow_root.get() { if let Some(shadow_root) = self.rare_data.shadow_root.get() {
doc.register_shadow_root(&shadow_root);
let shadow_root = shadow_root.upcast::<Node>(); let shadow_root = shadow_root.upcast::<Node>();
shadow_root.set_flag(NodeFlags::IS_CONNECTED, context.tree_connected); shadow_root.set_flag(NodeFlags::IS_CONNECTED, context.tree_connected);
for node in shadow_root.children() { for node in shadow_root.children() {
@ -2815,7 +2820,6 @@ impl VirtualMethods for Element {
return; return;
} }
let doc = document_from_node(self);
if let Some(ref value) = *self.id_attribute.borrow() { if let Some(ref value) = *self.id_attribute.borrow() {
if let Some(shadow_root) = self.upcast::<Node>().owner_shadow_root() { if let Some(shadow_root) = self.upcast::<Node>().owner_shadow_root() {
shadow_root.register_named_element(self, value.clone()); shadow_root.register_named_element(self, value.clone());