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

Auto merge of #6546 - michaelwu:slim-layoutdatawrapper, r=Ms2ger

Browse source 
Remove LayoutChan from LayoutDataWrapper

Saves 32 bytes in Node.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6546)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-05 21:39:12 -06:00
commit cc73aad447
5 changed files with 17 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -191,7 +191,7 @@ impl NodeFlags {
impl Drop for Node {
#[allow(unsafe_code)]
fn drop(&mut self) {
self.layout_data.dispose();
self.layout_data.dispose(self);
}
}
@ -212,7 +212,6 @@ pub struct SharedLayoutData {
/// Encapsulates the abstract layout data.
pub struct LayoutData {
chan: Option<LayoutChan>,
_shared_data: SharedLayoutData,
_data: NonZero<*const ()>,
}
@ -234,17 +233,12 @@ impl LayoutDataRef {
}
/// Sends layout data, if any, back to the layout task to be destroyed.
pub fn dispose(&self) {
pub fn dispose(&self, node: &Node) {
debug_assert!(task_state::get().is_script());
if let Some(mut layout_data) = mem::replace(&mut *self.data_cell.borrow_mut(), None) {
let layout_chan = layout_data.chan.take();
match layout_chan {
None => {}
Some(chan) => {
let LayoutChan(chan) = chan;
chan.send(Msg::ReapLayoutData(layout_data)).unwrap()
}
}
if let Some(layout_data) = mem::replace(&mut *self.data_cell.borrow_mut(), None) {
let win = window_from_node(node);
let LayoutChan(chan) = win.layout_chan();
chan.send(Msg::ReapLayoutData(layout_data)).unwrap()
}
}
@ -317,7 +311,7 @@ impl<'a> PrivateNodeHelpers for &'a Node {
node.r().set_flag(IS_IN_DOC, false);
vtable_for(&node.r()).unbind_from_tree(parent_in_doc);
}
self.layout_data.dispose();
self.layout_data.dispose(self);
}
//
@ -535,7 +529,7 @@ pub trait NodeHelpers {
impl<'a> NodeHelpers for &'a Node {
fn teardown(self) {
self.layout_data.dispose();
self.layout_data.dispose(self);
for kid in self.children() {
kid.r().teardown();
}