Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #2134 : mbrubeck/servo/frametree-clone, r=larsbergstrom

Browse source 
This fixes an issue where a ChildFrameTree is inserted into a clone of its parent, rather than its "real" parent, as noted in #2124.

This moves `FrameTree::iter` and the methods that depend on it into a new trait that is implemented on `Rc<FrameTree>`, since it's safe to clone an `Rc<FrameTree>`.

r? @larsbergstrom
This commit is contained in:
bors-servo 2014-04-16 19:19:08 -04:00
commit a52248f765
1 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/components/main/constellation.rs
View file

@ -58,22 +58,6 @@ struct FrameTree {
children: RefCell<~[ChildFrameTree]>,
}
// Need to clone the FrameTrees, but _not_ the Pipelines
impl Clone for FrameTree {
fn clone(&self) -> FrameTree {
let children = self.children
.borrow()
.iter()
.map(|child_frame_tree| child_frame_tree.clone())
.collect();
FrameTree {
pipeline: self.pipeline.clone(),
parent: self.parent.clone(),
children: RefCell::new(children),
}
}
}
struct ChildFrameTree {
frame_tree: Rc<FrameTree>,
/// Clipping rect representing the size and position, in page coordinates, of the visible
@ -106,6 +90,23 @@ enum ReplaceResult {
}
impl FrameTree {
fn to_sendable(&self) -> SendableFrameTree {
let sendable_frame_tree = SendableFrameTree {
pipeline: self.pipeline.to_sendable(),
children: self.children.borrow().iter().map(|frame_tree| frame_tree.to_sendable()).collect(),
};
sendable_frame_tree
}
}
trait FrameTreeTraversal {
fn contains(&self, id: PipelineId) -> bool;
fn find(&self, id: PipelineId) -> Option<Self>;
fn replace_child(&self, id: PipelineId, new_child: Self) -> ReplaceResult;
fn iter(&self) -> FrameTreeIterator;
}
impl FrameTreeTraversal for Rc<FrameTree> {
fn contains(&self, id: PipelineId) -> bool {
self.iter().any(|frame_tree| id == frame_tree.pipeline.id)
}
@ -130,17 +131,9 @@ impl FrameTree {
OriginalNode(new_child)
}
fn to_sendable(&self) -> SendableFrameTree {
let sendable_frame_tree = SendableFrameTree {
pipeline: self.pipeline.to_sendable(),
children: self.children.borrow().iter().map(|frame_tree| frame_tree.to_sendable()).collect(),
};
sendable_frame_tree
}
fn iter(&self) -> FrameTreeIterator {
FrameTreeIterator {
stack: ~[Rc::new(self.clone())],
stack: ~[self.clone()],
}
}
}