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

@ -1342,8 +1342,8 @@ impl Document {
pub fn trigger_mozbrowser_event(&self, event: MozBrowserEvent) {
if PREFS.is_mozbrowser_enabled() {
if let Some((containing_pipeline_id, subpage_id, _)) = self.window.parent_info() {
let event = ConstellationMsg::MozBrowserEvent(containing_pipeline_id,
if let Some((parent_pipeline_id, subpage_id, _)) = self.window.parent_info() {
let event = ConstellationMsg::MozBrowserEvent(parent_pipeline_id,
Some(subpage_id),
event);
self.window.constellation_chan().send(event).unwrap();

View file

@ -133,7 +133,7 @@ impl HTMLIFrameElement {
let load_info = IFrameLoadInfo {
load_data: load_data,
containing_pipeline_id: window.pipeline_id(),
parent_pipeline_id: window.pipeline_id(),
new_subpage_id: new_subpage_id,
old_subpage_id: old_subpage_id,
new_pipeline_id: new_pipeline_id,