Consistently use parent_pipeline_id

Instead of containing_pipeline_id, use parent_pipeline_id because it is
more clear that it refers to the immediate parent.
This commit is contained in:
Aneesh Agrawal 2016-06-09 21:02:40 -04:00
parent 9d097e7d15
commit b9b25b6f82
6 changed files with 56 additions and 56 deletions

View file

@ -150,10 +150,10 @@ impl Pipeline {
let (script_chan, content_ports) = match state.script_chan {
Some(script_chan) => {
let (containing_pipeline_id, subpage_id, frame_type) =
let (parent_pipeline_id, subpage_id, frame_type) =
state.parent_info.expect("script_pipeline != None but subpage_id == None");
let new_layout_info = NewLayoutInfo {
containing_pipeline_id: containing_pipeline_id,
parent_pipeline_id: parent_pipeline_id,
new_pipeline_id: state.id,
subpage_id: subpage_id,
frame_type: frame_type,