aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout
diff options
context:
space:
mode:
Diffstat (limited to 'components/layout')
-rw-r--r--components/layout/data.rs2
-rw-r--r--components/layout/traversal.rs2
-rw-r--r--components/layout/wrapper.rs4
3 files changed, 2 insertions, 6 deletions
diff --git a/components/layout/data.rs b/components/layout/data.rs
index e26e0a28431..75831d7c2ff 100644
--- a/components/layout/data.rs
+++ b/components/layout/data.rs
@@ -7,7 +7,6 @@ use incremental::RestyleDamage;
use msg::constellation_msg::ConstellationChan;
use parallel::DomParallelInfo;
use script::dom::node::SharedLayoutData;
-use script::layout_interface::LayoutChan;
use std::sync::Arc;
use style::properties::ComputedValues;
@@ -61,7 +60,6 @@ bitflags! {
}
pub struct LayoutDataWrapper {
- pub chan: Option<LayoutChan>,
pub shared_data: SharedLayoutData,
pub data: Box<PrivateLayoutData>,
}
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs
index dcfd4ef19bb..603245ecb88 100644
--- a/components/layout/traversal.rs
+++ b/components/layout/traversal.rs
@@ -132,7 +132,7 @@ impl<'a> PreorderDomTraversal for RecalcStyleForNode<'a> {
//
// FIXME(pcwalton): Stop allocating here. Ideally this should just be done by the HTML
// parser.
- node.initialize_layout_data(self.layout_context.shared.layout_chan.clone());
+ node.initialize_layout_data();
// Get the parent node.
let parent_opt = node.layout_parent_node(self.layout_context.shared);
diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
index 020d6af3bbe..4de67c7e6c9 100644
--- a/components/layout/wrapper.rs
+++ b/components/layout/wrapper.rs
@@ -56,7 +56,6 @@ use script::dom::node::{Node, NodeTypeId};
use script::dom::node::{LayoutNodeHelpers, RawLayoutNodeHelpers, SharedLayoutData};
use script::dom::node::{HAS_CHANGED, IS_DIRTY, HAS_DIRTY_SIBLINGS, HAS_DIRTY_DESCENDANTS};
use script::dom::text::Text;
-use script::layout_interface::LayoutChan;
use smallvec::VecLike;
use msg::constellation_msg::{PipelineId, SubpageId};
use util::str::is_whitespace;
@@ -179,12 +178,11 @@ impl<'ln> LayoutNode<'ln> {
/// Resets layout data and styles for the node.
///
/// FIXME(pcwalton): Do this as part of fragment building instead of in a traversal.
- pub fn initialize_layout_data(self, chan: LayoutChan) {
+ pub fn initialize_layout_data(self) {
let mut layout_data_ref = self.mutate_layout_data();
match *layout_data_ref {
None => {
*layout_data_ref = Some(LayoutDataWrapper {
- chan: Some(chan),
shared_data: SharedLayoutData { style: None },
data: box PrivateLayoutData::new(),
});