auto merge of #2496 : zwarich/servo/deriving-clone, r=jdm

This commit is contained in:
bors-servo 2014-05-28 10:13:24 -04:00
commit be938c4bb6

View file

@ -58,6 +58,7 @@ struct FrameTree {
pub children: RefCell<Vec<ChildFrameTree>>,
}
#[deriving(Clone)]
struct ChildFrameTree {
frame_tree: Rc<FrameTree>,
/// Clipping rect representing the size and position, in page coordinates, of the visible
@ -65,15 +66,6 @@ struct ChildFrameTree {
pub rect: Option<Rect<f32>>,
}
impl Clone for ChildFrameTree {
fn clone(&self) -> ChildFrameTree {
ChildFrameTree {
frame_tree: self.frame_tree.clone(),
rect: self.rect.clone(),
}
}
}
pub struct SendableFrameTree {
pub pipeline: CompositionPipeline,
pub children: Vec<SendableChildFrameTree>,