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

Rename the pipeline ID fields in NewLayoutInfo.

Browse source 
This will make the distinction clearer with the subpage ID field to be added.
This commit is contained in:
Ms2ger 2014-05-14 12:44:59 +02:00
parent 52fbaf7e17
commit 69172a1ae5
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/main/pipeline.rs
View file

@ -86,8 +86,8 @@ impl Pipeline {
layout_shutdown_chan); layout_shutdown_chan);
let new_layout_info = NewLayoutInfo { let new_layout_info = NewLayoutInfo {
old_id: script_pipeline.id.clone(), old_pipeline_id: script_pipeline.id.clone(),
new_id: id, new_pipeline_id: id,
layout_chan: layout_chan.clone(), layout_chan: layout_chan.clone(),
}; };

12
src/components/script/script_task.rs
View file

@ -91,8 +91,8 @@ pub enum ScriptMsg {
} }
pub struct NewLayoutInfo { pub struct NewLayoutInfo {
pub old_id: PipelineId, pub old_pipeline_id: PipelineId,
pub new_id: PipelineId, pub new_pipeline_id: PipelineId,
pub layout_chan: LayoutChan, pub layout_chan: LayoutChan,
} }
@ -782,18 +782,18 @@ impl ScriptTask {
fn handle_new_layout(&self, new_layout_info: NewLayoutInfo) { fn handle_new_layout(&self, new_layout_info: NewLayoutInfo) {
debug!("Script: new layout: {:?}", new_layout_info); debug!("Script: new layout: {:?}", new_layout_info);
let NewLayoutInfo { let NewLayoutInfo {
old_id, old_pipeline_id,
new_id, new_pipeline_id,
layout_chan layout_chan
} = new_layout_info; } = new_layout_info;
let mut page = self.page.borrow_mut(); let mut page = self.page.borrow_mut();
let parent_page = page.find(old_id).expect("ScriptTask: received a layout let parent_page = page.find(old_pipeline_id).expect("ScriptTask: received a layout
whose parent has a PipelineId which does not correspond to a pipeline in the script whose parent has a PipelineId which does not correspond to a pipeline in the script
task's page tree. This is a bug."); task's page tree. This is a bug.");
let new_page = { let new_page = {
let window_size = parent_page.window_size.deref().get(); let window_size = parent_page.window_size.deref().get();
Page::new(new_id, layout_chan, window_size, Page::new(new_pipeline_id, layout_chan, window_size,
parent_page.resource_task.deref().clone(), parent_page.resource_task.deref().clone(),
self.constellation_chan.clone(), self.constellation_chan.clone(),
self.js_context.borrow().get_ref().clone()) self.js_context.borrow().get_ref().clone())