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

Utilize Constellation::pipeline utility.

Browse source
This commit is contained in:
Corey Farwell 2016-02-27 22:03:01 -05:00
parent b13b8035ae
commit 0112c359f5
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/compositing/constellation.rs
View file

@ -973,8 +973,7 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
self.push_pending_frame(new_pipeline_id, Some(source_id)); self.push_pending_frame(new_pipeline_id, Some(source_id));
// Send message to ScriptThread that will suspend all timers // Send message to ScriptThread that will suspend all timers
let old_pipeline = self.pipelines.get(&source_id).unwrap(); self.pipeline(source_id).freeze();
old_pipeline.freeze();
Some(new_pipeline_id) Some(new_pipeline_id)
} }
} }
@ -1396,18 +1395,18 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
// pipeline in the frame tree. // pipeline in the frame tree.
let frame = self.frame(root_frame_id); let frame = self.frame(root_frame_id);
let pipeline = self.pipelines.get(&frame.current).unwrap(); let pipeline = self.pipeline(frame.current);
let _ = pipeline.script_chan.send(ConstellationControlMsg::Resize(pipeline.id, new_size)); let _ = pipeline.script_chan.send(ConstellationControlMsg::Resize(pipeline.id, new_size));
for pipeline_id in frame.prev.iter().chain(&frame.next) { for pipeline_id in frame.prev.iter().chain(&frame.next) {
let pipeline = self.pipelines.get(pipeline_id).unwrap(); let pipeline = self.pipeline(*pipeline_id);
let _ = pipeline.script_chan.send(ConstellationControlMsg::ResizeInactive(pipeline.id, new_size)); let _ = pipeline.script_chan.send(ConstellationControlMsg::ResizeInactive(pipeline.id, new_size));
} }
} }
// Send resize message to any pending pipelines that aren't loaded yet. // Send resize message to any pending pipelines that aren't loaded yet.
for pending_frame in &self.pending_frames { for pending_frame in &self.pending_frames {
let pipeline = self.pipelines.get(&pending_frame.new_pipeline_id).unwrap(); let pipeline = self.pipeline(pending_frame.new_pipeline_id);
if pipeline.parent_info.is_none() { if pipeline.parent_info.is_none() {
let _ = pipeline.script_chan.send(ConstellationControlMsg::Resize(pipeline.id, let _ = pipeline.script_chan.send(ConstellationControlMsg::Resize(pipeline.id,
new_size)); new_size));