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

Make OpaqueStyleAndLayoutData::dispose a method on Node.

Browse source
This commit is contained in:
Ms2ger 2016-06-14 20:07:28 +01:00
parent 5c03dd8eb1
commit 5cab8ff8d2
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/script/dom/node.rs
View file

@ -171,7 +171,7 @@ impl NodeFlags {
impl Drop for Node { impl Drop for Node {
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn drop(&mut self) { fn drop(&mut self) {
self.style_and_layout_data.get().map(|d| d.dispose(self)); self.style_and_layout_data.get().map(|d| self.dispose(d));
} }
} }
@ -196,17 +196,15 @@ unsafe impl Send for OpaqueStyleAndLayoutData {}
no_jsmanaged_fields!(OpaqueStyleAndLayoutData); no_jsmanaged_fields!(OpaqueStyleAndLayoutData);
impl OpaqueStyleAndLayoutData { impl Node {
/// Sends the style and layout data, if any, back to the layout thread to be destroyed. /// Sends the style and layout data, if any, back to the layout thread to be destroyed.
pub fn dispose(self, node: &Node) { pub fn dispose(&self, data: OpaqueStyleAndLayoutData) {
debug_assert!(thread_state::get().is_script()); debug_assert!(thread_state::get().is_script());
let win = window_from_node(node); let win = window_from_node(self);
node.style_and_layout_data.set(None); self.style_and_layout_data.set(None);
win.layout_chan().send(Msg::ReapStyleAndLayoutData(self)).unwrap(); win.layout_chan().send(Msg::ReapStyleAndLayoutData(data)).unwrap();
}
} }
impl Node {
/// Adds a new child to the end of this node's list of children. /// Adds a new child to the end of this node's list of children.
/// ///
/// Fails unless `new_child` is disconnected from the tree. /// Fails unless `new_child` is disconnected from the tree.
@ -292,7 +290,7 @@ impl Node {
for node in child.traverse_preorder() { for node in child.traverse_preorder() {
node.set_flag(IS_IN_DOC, false); node.set_flag(IS_IN_DOC, false);
vtable_for(&&*node).unbind_from_tree(&context); vtable_for(&&*node).unbind_from_tree(&context);
node.style_and_layout_data.get().map(|d| d.dispose(&node)); node.style_and_layout_data.get().map(|d| node.dispose(d));
} }
self.owner_doc().content_and_heritage_changed(self, NodeDamage::OtherNodeDamage); self.owner_doc().content_and_heritage_changed(self, NodeDamage::OtherNodeDamage);
@ -340,7 +338,7 @@ impl<'a> Iterator for QuerySelectorIterator {
impl Node { impl Node {
pub fn teardown(&self) { pub fn teardown(&self) {
self.style_and_layout_data.get().map(|d| d.dispose(self)); self.style_and_layout_data.get().map(|d| self.dispose(d));
for kid in self.children() { for kid in self.children() {
kid.teardown(); kid.teardown();
} }