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

auto merge of #2415 : Ms2ger/servo/find-all, r=jdm

Browse source 
...sg.
This commit is contained in:
bors-servo 2014-05-13 13:49:31 -04:00
commit 736098eeac
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -549,14 +549,7 @@ impl Constellation {
// or a new url entered. // or a new url entered.
// Start by finding the frame trees matching the pipeline id, // Start by finding the frame trees matching the pipeline id,
// and add the new pipeline to their sub frames. // and add the new pipeline to their sub frames.
let frame_trees: Vec<Rc<FrameTree>> = { let frame_trees = self.find_all(source_pipeline_id);
let matching_navi_frames = self.navigation_context.find_all(source_pipeline_id);
let matching_pending_frames = self.pending_frames.iter().filter_map(|frame_change| {
frame_change.after.find(source_pipeline_id)
});
matching_navi_frames.move_iter().chain(matching_pending_frames).collect()
};
if frame_trees.is_empty() { if frame_trees.is_empty() {
fail!("Constellation: source pipeline id of LoadIframeUrlMsg is not in fail!("Constellation: source pipeline id of LoadIframeUrlMsg is not in
navigation context, nor is it in a pending frame. This should be navigation context, nor is it in a pending frame. This should be