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

auto merge of #2132 : mbrubeck/servo/constellation-cleanup, r=larsbergstrom

Browse source 
Just some mostly-mechanical refactoring to remove unnecessary mutability and unnecessary exports in constellation.rs.
This commit is contained in:
bors-servo 2014-04-16 15:49:16 -04:00
commit beb8513796
1 changed files with 48 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,18 +42,18 @@ pub struct Constellation {
resource_task: ResourceTask, resource_task: ResourceTask,
image_cache_task: ImageCacheTask, image_cache_task: ImageCacheTask,
pipelines: HashMap<PipelineId, Rc<Pipeline>>, pipelines: HashMap<PipelineId, Rc<Pipeline>>,
navigation_context: NavigationContext, priv navigation_context: NavigationContext,
priv next_pipeline_id: PipelineId, priv next_pipeline_id: PipelineId,
pending_frames: ~[FrameChange], priv pending_frames: ~[FrameChange],
pending_sizes: HashMap<(PipelineId, SubpageId), Rect<f32>>, priv pending_sizes: HashMap<(PipelineId, SubpageId), Rect<f32>>,
profiler_chan: ProfilerChan, profiler_chan: ProfilerChan,
window_size: Size2D<uint>, window_size: Size2D<uint>,
opts: Opts, opts: Opts,
} }
/// Stores the Id of the outermost frame's pipeline, along with a vector of children frames /// Stores the Id of the outermost frame's pipeline, along with a vector of children frames
pub struct FrameTree { struct FrameTree {
pipeline: RefCell<Rc<Pipeline>>, pipeline: Rc<Pipeline>,
parent: RefCell<Option<Rc<Pipeline>>>, parent: RefCell<Option<Rc<Pipeline>>>,
children: RefCell<~[ChildFrameTree]>, children: RefCell<~[ChildFrameTree]>,
} }
@ -74,7 +74,7 @@ impl Clone for FrameTree {
} }
} }
pub struct ChildFrameTree { struct ChildFrameTree {
frame_tree: Rc<FrameTree>, frame_tree: Rc<FrameTree>,
/// Clipping rect representing the size and position, in page coordinates, of the visible /// Clipping rect representing the size and position, in page coordinates, of the visible
/// region of the child frame relative to the parent. /// region of the child frame relative to the parent.
@ -107,12 +107,12 @@ enum ReplaceResult {
impl FrameTree { impl FrameTree {
fn contains(&self, id: PipelineId) -> bool { fn contains(&self, id: PipelineId) -> bool {
self.iter().any(|frame_tree| id == frame_tree.pipeline.borrow().id) self.iter().any(|frame_tree| id == frame_tree.pipeline.id)
} }
/// Returns the frame tree whose key is id /// Returns the frame tree whose key is id
fn find(&self, id: PipelineId) -> Option<Rc<FrameTree>> { fn find(&self, id: PipelineId) -> Option<Rc<FrameTree>> {
self.iter().find(|frame_tree| id == frame_tree.pipeline.borrow().id) self.iter().find(|frame_tree| id == frame_tree.pipeline.id)
} }
/// Replaces a node of the frame tree in place. Returns the node that was removed or the original node /// Replaces a node of the frame tree in place. Returns the node that was removed or the original node
@ -121,7 +121,7 @@ impl FrameTree {
for frame_tree in self.iter() { for frame_tree in self.iter() {
let mut children = frame_tree.children.borrow_mut(); let mut children = frame_tree.children.borrow_mut();
let mut child = children.mut_iter() let mut child = children.mut_iter()
.find(|child| child.frame_tree.pipeline.borrow().id == id); .find(|child| child.frame_tree.pipeline.id == id);
for child in child.mut_iter() { for child in child.mut_iter() {
new_child.parent.set(child.frame_tree.parent.get()); new_child.parent.set(child.frame_tree.parent.get());
return ReplacedNode(replace(&mut child.frame_tree, new_child)); return ReplacedNode(replace(&mut child.frame_tree, new_child));
@ -132,13 +132,13 @@ impl FrameTree {
fn to_sendable(&self) -> SendableFrameTree { fn to_sendable(&self) -> SendableFrameTree {
let sendable_frame_tree = SendableFrameTree { let sendable_frame_tree = SendableFrameTree {
pipeline: self.pipeline.borrow().to_sendable(), pipeline: self.pipeline.to_sendable(),
children: self.children.borrow().iter().map(|frame_tree| frame_tree.to_sendable()).collect(), children: self.children.borrow().iter().map(|frame_tree| frame_tree.to_sendable()).collect(),
}; };
sendable_frame_tree sendable_frame_tree
} }
pub fn iter(&self) -> FrameTreeIterator { fn iter(&self) -> FrameTreeIterator {
FrameTreeIterator { FrameTreeIterator {
stack: ~[Rc::new(self.clone())], stack: ~[Rc::new(self.clone())],
} }
@ -157,8 +157,8 @@ impl ChildFrameTree {
/// An iterator over a frame tree, returning nodes in depth-first order. /// An iterator over a frame tree, returning nodes in depth-first order.
/// Note that this iterator should _not_ be used to mutate nodes _during_ /// Note that this iterator should _not_ be used to mutate nodes _during_
/// iteration. Mutating nodes once the iterator is out of scope is OK. /// iteration. Mutating nodes once the iterator is out of scope is OK.
pub struct FrameTreeIterator { struct FrameTreeIterator {
priv stack: ~[Rc<FrameTree>], stack: ~[Rc<FrameTree>],
} }
impl Iterator<Rc<FrameTree>> for FrameTreeIterator { impl Iterator<Rc<FrameTree>> for FrameTreeIterator {
@ -176,21 +176,21 @@ impl Iterator<Rc<FrameTree>> for FrameTreeIterator {
} }
/// Represents the portion of a page that is changing in navigating. /// Represents the portion of a page that is changing in navigating.
pub struct FrameChange { struct FrameChange {
before: Option<PipelineId>, before: Option<PipelineId>,
after: Rc<FrameTree>, after: Rc<FrameTree>,
navigation_type: NavigationType, navigation_type: NavigationType,
} }
/// Stores the Id's of the pipelines previous and next in the browser's history /// Stores the Id's of the pipelines previous and next in the browser's history
pub struct NavigationContext { struct NavigationContext {
previous: ~[Rc<FrameTree>], previous: ~[Rc<FrameTree>],
next: ~[Rc<FrameTree>], next: ~[Rc<FrameTree>],
current: Option<Rc<FrameTree>>, current: Option<Rc<FrameTree>>,
} }
impl NavigationContext { impl NavigationContext {
pub fn new() -> NavigationContext { fn new() -> NavigationContext {
NavigationContext { NavigationContext {
previous: ~[], previous: ~[],
next: ~[], next: ~[],
@ -201,14 +201,14 @@ impl NavigationContext {
/* Note that the following two methods can fail. They should only be called * /* Note that the following two methods can fail. They should only be called *
* when it is known that there exists either a previous page or a next page. */ * when it is known that there exists either a previous page or a next page. */
pub fn back(&mut self) -> Rc<FrameTree> { fn back(&mut self) -> Rc<FrameTree> {
self.next.push(self.current.take_unwrap()); self.next.push(self.current.take_unwrap());
let prev = self.previous.pop().unwrap(); let prev = self.previous.pop().unwrap();
self.current = Some(prev.clone()); self.current = Some(prev.clone());
prev prev
} }
pub fn forward(&mut self) -> Rc<FrameTree> { fn forward(&mut self) -> Rc<FrameTree> {
self.previous.push(self.current.take_unwrap()); self.previous.push(self.current.take_unwrap());
let next = self.next.pop().unwrap(); let next = self.next.pop().unwrap();
self.current = Some(next.clone()); self.current = Some(next.clone());
@ -216,8 +216,8 @@ impl NavigationContext {
} }
/// Loads a new set of page frames, returning all evicted frame trees /// Loads a new set of page frames, returning all evicted frame trees
pub fn load(&mut self, frame_tree: Rc<FrameTree>) -> ~[Rc<FrameTree>] { fn load(&mut self, frame_tree: Rc<FrameTree>) -> ~[Rc<FrameTree>] {
debug!("navigating to {:?}", frame_tree.pipeline.borrow().id); debug!("navigating to {:?}", frame_tree.pipeline.id);
let evicted = replace(&mut self.next, ~[]); let evicted = replace(&mut self.next, ~[]);
if self.current.is_some() { if self.current.is_some() {
self.previous.push(self.current.take_unwrap()); self.previous.push(self.current.take_unwrap());
@ -227,7 +227,7 @@ impl NavigationContext {
} }
/// Returns the frame trees whose keys are pipeline_id. /// Returns the frame trees whose keys are pipeline_id.
pub fn find_all(&mut self, pipeline_id: PipelineId) -> ~[Rc<FrameTree>] { fn find_all(&mut self, pipeline_id: PipelineId) -> ~[Rc<FrameTree>] {
let from_current = self.current.iter().filter_map(|frame_tree| { let from_current = self.current.iter().filter_map(|frame_tree| {
frame_tree.find(pipeline_id) frame_tree.find(pipeline_id)
}); });
@ -240,7 +240,7 @@ impl NavigationContext {
from_prev.chain(from_current).chain(from_next).collect() from_prev.chain(from_current).chain(from_next).collect()
} }
pub fn contains(&mut self, pipeline_id: PipelineId) -> bool { fn contains(&mut self, pipeline_id: PipelineId) -> bool {
let from_current = self.current.iter(); let from_current = self.current.iter();
let from_next = self.next.iter(); let from_next = self.next.iter();
let from_prev = self.previous.iter(); let from_prev = self.previous.iter();
@ -307,7 +307,7 @@ impl Constellation {
} }
/// Returns both the navigation context and pending frame trees whose keys are pipeline_id. /// Returns both the navigation context and pending frame trees whose keys are pipeline_id.
pub fn find_all(&mut self, pipeline_id: PipelineId) -> ~[Rc<FrameTree>] { fn find_all(&mut self, pipeline_id: PipelineId) -> ~[Rc<FrameTree>] {
let matching_navi_frames = self.navigation_context.find_all(pipeline_id); let matching_navi_frames = self.navigation_context.find_all(pipeline_id);
let matching_pending_frames = self.pending_frames.iter().filter_map(|frame_change| { let matching_pending_frames = self.pending_frames.iter().filter_map(|frame_change| {
frame_change.after.find(pipeline_id) frame_change.after.find(pipeline_id)
@ -422,7 +422,7 @@ impl Constellation {
self.pending_frames.push(FrameChange{ self.pending_frames.push(FrameChange{
before: Some(pipeline_id), before: Some(pipeline_id),
after: Rc::new(FrameTree { after: Rc::new(FrameTree {
pipeline: RefCell::new(pipeline_wrapped.clone()), pipeline: pipeline_wrapped.clone(),
parent: RefCell::new(None), parent: RefCell::new(None),
children: RefCell::new(~[]), children: RefCell::new(~[]),
}), }),
@ -448,7 +448,7 @@ impl Constellation {
self.pending_frames.push(FrameChange { self.pending_frames.push(FrameChange {
before: None, before: None,
after: Rc::new(FrameTree { after: Rc::new(FrameTree {
pipeline: RefCell::new(pipeline_wrapped.clone()), pipeline: pipeline_wrapped.clone(),
parent: RefCell::new(None), parent: RefCell::new(None),
children: RefCell::new(~[]), children: RefCell::new(~[]),
}), }),
@ -463,7 +463,7 @@ impl Constellation {
// Returns true if a child frame tree's subpage id matches the given subpage id // Returns true if a child frame tree's subpage id matches the given subpage id
let subpage_eq = |child_frame_tree: & &mut ChildFrameTree| { let subpage_eq = |child_frame_tree: & &mut ChildFrameTree| {
child_frame_tree.frame_tree.pipeline.borrow(). child_frame_tree.frame_tree.pipeline.
subpage_id.expect("Constellation: subpage_id.expect("Constellation:
child frame does not have a subpage id. This should not be possible.") child frame does not have a subpage id. This should not be possible.")
== subpage_id == subpage_id
@ -479,10 +479,9 @@ impl Constellation {
child_frame_tree.rect = Some(rect.clone()); child_frame_tree.rect = Some(rect.clone());
// NOTE: work around borrowchk issues // NOTE: work around borrowchk issues
let pipeline = &child_frame_tree.frame_tree.pipeline; let pipeline = &child_frame_tree.frame_tree.pipeline;
if !already_sent.contains(&pipeline.borrow().id) { if !already_sent.contains(&pipeline.id) {
let Size2D { width, height } = rect.size; let Size2D { width, height } = rect.size;
if is_active { if is_active {
let pipeline = pipeline.borrow();
let ScriptChan(ref script_chan) = pipeline.script_chan; let ScriptChan(ref script_chan) = pipeline.script_chan;
script_chan.send(ResizeMsg(pipeline.id, Size2D { script_chan.send(ResizeMsg(pipeline.id, Size2D {
width: width as uint, width: width as uint,
@ -492,7 +491,7 @@ impl Constellation {
LayerId::null(), LayerId::null(),
rect)); rect));
} else { } else {
already_sent.insert(pipeline.borrow().id); already_sent.insert(pipeline.id);
} }
}; };
}; };
@ -596,7 +595,7 @@ impl Constellation {
for frame_tree in frame_trees.iter() { for frame_tree in frame_trees.iter() {
frame_tree.children.borrow_mut().push(ChildFrameTree { frame_tree.children.borrow_mut().push(ChildFrameTree {
frame_tree: Rc::new(FrameTree { frame_tree: Rc::new(FrameTree {
pipeline: RefCell::new(pipeline_wrapped.clone()), pipeline: pipeline_wrapped.clone(),
parent: RefCell::new(Some(source_pipeline.clone())), parent: RefCell::new(Some(source_pipeline.clone())),
children: RefCell::new(~[]), children: RefCell::new(~[]),
}), }),
@ -630,7 +629,7 @@ impl Constellation {
// changes would be overriden by changing the subframe associated with source_id. // changes would be overriden by changing the subframe associated with source_id.
let parent = source_frame.parent.clone(); let parent = source_frame.parent.clone();
let subpage_id = source_frame.pipeline.borrow().subpage_id; let subpage_id = source_frame.pipeline.subpage_id;
let next_pipeline_id = self.get_next_pipeline_id(); let next_pipeline_id = self.get_next_pipeline_id();
let pipeline = Pipeline::create(next_pipeline_id, let pipeline = Pipeline::create(next_pipeline_id,
@ -649,7 +648,7 @@ impl Constellation {
self.pending_frames.push(FrameChange{ self.pending_frames.push(FrameChange{
before: Some(source_id), before: Some(source_id),
after: Rc::new(FrameTree { after: Rc::new(FrameTree {
pipeline: RefCell::new(pipeline_wrapped.clone()), pipeline: pipeline_wrapped.clone(),
parent: parent, parent: parent,
children: RefCell::new(~[]), children: RefCell::new(~[]),
}), }),
@ -673,7 +672,7 @@ impl Constellation {
} else { } else {
let old = self.current_frame().get_ref(); let old = self.current_frame().get_ref();
for frame in old.iter() { for frame in old.iter() {
frame.pipeline.borrow().revoke_paint_permission(); frame.pipeline.revoke_paint_permission();
} }
} }
self.navigation_context.forward() self.navigation_context.forward()
@ -685,7 +684,7 @@ impl Constellation {
} else { } else {
let old = self.current_frame().get_ref(); let old = self.current_frame().get_ref();
for frame in old.iter() { for frame in old.iter() {
frame.pipeline.borrow().revoke_paint_permission(); frame.pipeline.revoke_paint_permission();
} }
} }
self.navigation_context.back() self.navigation_context.back()
@ -693,7 +692,7 @@ impl Constellation {
}; };
for frame in destination_frame.iter() { for frame in destination_frame.iter() {
frame.pipeline.borrow().reload(); frame.pipeline.reload();
} }
self.grant_paint_permission(destination_frame, constellation_msg::Navigate); self.grant_paint_permission(destination_frame, constellation_msg::Navigate);
@ -711,7 +710,7 @@ impl Constellation {
// impossible to occur. // impossible to occur.
if current_frame.contains(pipeline_id) { if current_frame.contains(pipeline_id) {
for frame in current_frame.iter() { for frame in current_frame.iter() {
frame.pipeline.borrow().grant_paint_permission(); frame.pipeline.grant_paint_permission();
} }
return; return;
} }
@ -721,7 +720,7 @@ impl Constellation {
// If it is not found, it simply means that this pipeline will not receive // If it is not found, it simply means that this pipeline will not receive
// permission to paint. // permission to paint.
let pending_index = self.pending_frames.iter().rposition(|frame_change| { let pending_index = self.pending_frames.iter().rposition(|frame_change| {
frame_change.after.pipeline.borrow().id == pipeline_id frame_change.after.pipeline.id == pipeline_id
}); });
for &pending_index in pending_index.iter() { for &pending_index in pending_index.iter() {
let frame_change = self.pending_frames.swap_remove(pending_index).unwrap(); let frame_change = self.pending_frames.swap_remove(pending_index).unwrap();
@ -749,7 +748,7 @@ impl Constellation {
frame not contained in the current frame. This is a bug"); frame not contained in the current frame. This is a bug");
for frame in to_revoke.iter() { for frame in to_revoke.iter() {
frame.pipeline.borrow().revoke_paint_permission(); frame.pipeline.revoke_paint_permission();
} }
// If to_add is not the root frame, then replace revoked_frame with it. // If to_add is not the root frame, then replace revoked_frame with it.
@ -759,8 +758,8 @@ impl Constellation {
{ {
if to_add.parent.borrow().is_some() { if to_add.parent.borrow().is_some() {
debug!("Constellation: replacing {:?} with {:?} in {:?}", debug!("Constellation: replacing {:?} with {:?} in {:?}",
revoke_id, to_add.pipeline.borrow().id, revoke_id, to_add.pipeline.id,
next_frame_tree.pipeline.borrow().id); next_frame_tree.pipeline.id);
flag = true; flag = true;
} }
} }
@ -773,7 +772,7 @@ impl Constellation {
// Add to_add to parent's children, if it is not the root // Add to_add to parent's children, if it is not the root
let parent = &to_add.parent; let parent = &to_add.parent;
for parent in parent.borrow().iter() { for parent in parent.borrow().iter() {
let subpage_id = to_add.pipeline.borrow().subpage_id let subpage_id = to_add.pipeline.subpage_id
.expect("Constellation: .expect("Constellation:
Child frame's subpage id is None. This should be impossible."); Child frame's subpage id is None. This should be impossible.");
let rect = self.pending_sizes.pop(&(parent.id, subpage_id)); let rect = self.pending_sizes.pop(&(parent.id, subpage_id));
@ -797,14 +796,14 @@ impl Constellation {
let mut already_seen = HashSet::new(); let mut already_seen = HashSet::new();
for frame_tree in self.current_frame().iter() { for frame_tree in self.current_frame().iter() {
debug!("constellation sending resize message to active frame"); debug!("constellation sending resize message to active frame");
let pipeline = &frame_tree.pipeline.borrow(); let pipeline = &frame_tree.pipeline;
let ScriptChan(ref chan) = pipeline.script_chan; let ScriptChan(ref chan) = pipeline.script_chan;
chan.try_send(ResizeMsg(pipeline.id, new_size)); chan.try_send(ResizeMsg(pipeline.id, new_size));
already_seen.insert(pipeline.id); already_seen.insert(pipeline.id);
} }
for frame_tree in self.navigation_context.previous.iter() for frame_tree in self.navigation_context.previous.iter()
.chain(self.navigation_context.next.iter()) { .chain(self.navigation_context.next.iter()) {
let pipeline = &frame_tree.pipeline.borrow(); let pipeline = &frame_tree.pipeline;
if !already_seen.contains(&pipeline.id) { if !already_seen.contains(&pipeline.id) {
debug!("constellation sending resize message to inactive frame"); debug!("constellation sending resize message to inactive frame");
let ScriptChan(ref chan) = pipeline.script_chan; let ScriptChan(ref chan) = pipeline.script_chan;
@ -819,9 +818,8 @@ impl Constellation {
let frame_tree = &change.after; let frame_tree = &change.after;
if frame_tree.parent.borrow().is_none() { if frame_tree.parent.borrow().is_none() {
debug!("constellation sending resize message to pending outer frame"); debug!("constellation sending resize message to pending outer frame");
let pipeline = frame_tree.pipeline.borrow(); let ScriptChan(ref chan) = frame_tree.pipeline.script_chan;
let ScriptChan(ref chan) = pipeline.script_chan; chan.send(ResizeMsg(frame_tree.pipeline.id, new_size))
chan.send(ResizeMsg(pipeline.id, new_size))
} }
} }
@ -833,15 +831,14 @@ impl Constellation {
// TODO(tkuehn): should only exit once per unique script task, // TODO(tkuehn): should only exit once per unique script task,
// and then that script task will handle sub-exits // and then that script task will handle sub-exits
for frame_tree in frame_tree.iter() { for frame_tree in frame_tree.iter() {
let pipeline = frame_tree.pipeline.borrow(); frame_tree.pipeline.exit();
pipeline.exit(); self.pipelines.remove(&frame_tree.pipeline.id);
self.pipelines.remove(&pipeline.id);
} }
} }
fn handle_evicted_frames(&mut self, evicted: ~[Rc<FrameTree>]) { fn handle_evicted_frames(&mut self, evicted: ~[Rc<FrameTree>]) {
for frame_tree in evicted.iter() { for frame_tree in evicted.iter() {
if !self.navigation_context.contains(frame_tree.pipeline.borrow().id) { if !self.navigation_context.contains(frame_tree.pipeline.id) {
self.close_pipelines(frame_tree.clone()); self.close_pipelines(frame_tree.clone());
} else { } else {
let frames = frame_tree.children.borrow().iter() let frames = frame_tree.children.borrow().iter()
@ -875,7 +872,7 @@ impl Constellation {
Some(()) => { Some(()) => {
let mut iter = frame_tree.iter(); let mut iter = frame_tree.iter();
for frame in iter { for frame in iter {
frame.pipeline.borrow().grant_paint_permission(); frame.pipeline.grant_paint_permission();
} }
} }
None => {} // message has been discarded, probably shutting down None => {} // message has been discarded, probably shutting down