diff options
| -rw-r--r-- | components/script/dom/htmliframeelement.rs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 7273e063e0b..56ad1d3df39 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -66,7 +66,6 @@ pub struct HTMLIFrameElement { htmlelement: HTMLElement, pipeline_id: Cell<Option<PipelineId>>, subpage_id: Cell<Option<SubpageId>>, - containing_page_pipeline_id: Cell<Option<PipelineId>>, sandbox: Cell<Option<u8>>, load_blocker: DOMRefCell<Option<LoadBlocker>>, } @@ -126,8 +125,6 @@ impl HTMLIFrameElement { let new_pipeline_id = self.pipeline_id.get().unwrap(); let private_iframe = self.privatebrowsing(); - self.containing_page_pipeline_id.set(Some(window.pipeline())); - let ConstellationChan(ref chan) = window.constellation_chan(); let load_info = IFrameLoadInfo { url: url, @@ -192,7 +189,6 @@ impl HTMLIFrameElement { htmlelement: HTMLElement::new_inherited(localName, prefix, document), pipeline_id: Cell::new(None), subpage_id: Cell::new(None), - containing_page_pipeline_id: Cell::new(None), sandbox: Cell::new(None), load_blocker: DOMRefCell::new(None), } @@ -207,11 +203,6 @@ impl HTMLIFrameElement { } #[inline] - pub fn containing_page_pipeline_id(&self) -> Option<PipelineId> { - self.containing_page_pipeline_id.get() - } - - #[inline] pub fn pipeline_id(&self) -> Option<PipelineId> { self.pipeline_id.get() } @@ -373,7 +364,7 @@ pub fn Navigate(iframe: &HTMLIFrameElement, direction: NavigationDirection) -> E let window = window_from_node(iframe); let window = window.r(); - let pipeline_info = Some((iframe.containing_page_pipeline_id().unwrap(), + let pipeline_info = Some((window.pipeline(), iframe.subpage_id().unwrap())); let ConstellationChan(ref chan) = window.constellation_chan(); let msg = ConstellationMsg::Navigate(pipeline_info, direction); |