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

Remove containing_page_pipeline_id

Browse source
This commit is contained in:
Stephen (Ziyun) Li 2016-04-14 00:25:28 -04:00
parent 25ae04057c
commit 29e268b659
No known key found for this signature in database
GPG key ID: 87FCA03CDF6996FD
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/htmliframeelement.rs
View file

@ -66,7 +66,6 @@ pub struct HTMLIFrameElement {
htmlelement: HTMLElement, htmlelement: HTMLElement,
pipeline_id: Cell<Option<PipelineId>>, pipeline_id: Cell<Option<PipelineId>>,
subpage_id: Cell<Option<SubpageId>>, subpage_id: Cell<Option<SubpageId>>,
containing_page_pipeline_id: Cell<Option<PipelineId>>,
sandbox: Cell<Option<u8>>, sandbox: Cell<Option<u8>>,
load_blocker: DOMRefCell<Option<LoadBlocker>>, load_blocker: DOMRefCell<Option<LoadBlocker>>,
} }
@ -126,8 +125,6 @@ impl HTMLIFrameElement {
let new_pipeline_id = self.pipeline_id.get().unwrap(); let new_pipeline_id = self.pipeline_id.get().unwrap();
let private_iframe = self.privatebrowsing(); let private_iframe = self.privatebrowsing();
self.containing_page_pipeline_id.set(Some(window.pipeline()));
let ConstellationChan(ref chan) = window.constellation_chan(); let ConstellationChan(ref chan) = window.constellation_chan();
let load_info = IFrameLoadInfo { let load_info = IFrameLoadInfo {
url: url, url: url,
@ -192,7 +189,6 @@ impl HTMLIFrameElement {
htmlelement: HTMLElement::new_inherited(localName, prefix, document), htmlelement: HTMLElement::new_inherited(localName, prefix, document),
pipeline_id: Cell::new(None), pipeline_id: Cell::new(None),
subpage_id: Cell::new(None), subpage_id: Cell::new(None),
containing_page_pipeline_id: Cell::new(None),
sandbox: Cell::new(None), sandbox: Cell::new(None),
load_blocker: DOMRefCell::new(None), load_blocker: DOMRefCell::new(None),
} }
@ -206,11 +202,6 @@ impl HTMLIFrameElement {
Node::reflect_node(box element, document, HTMLIFrameElementBinding::Wrap) Node::reflect_node(box element, document, HTMLIFrameElementBinding::Wrap)
} }
#[inline]
pub fn containing_page_pipeline_id(&self) -> Option<PipelineId> {
self.containing_page_pipeline_id.get()
}
#[inline] #[inline]
pub fn pipeline_id(&self) -> Option<PipelineId> { pub fn pipeline_id(&self) -> Option<PipelineId> {
self.pipeline_id.get() 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_from_node(iframe);
let window = window.r(); let window = window.r();
let pipeline_info = Some((iframe.containing_page_pipeline_id().unwrap(), let pipeline_info = Some((window.pipeline(),
iframe.subpage_id().unwrap())); iframe.subpage_id().unwrap()));
let ConstellationChan(ref chan) = window.constellation_chan(); let ConstellationChan(ref chan) = window.constellation_chan();
let msg = ConstellationMsg::Navigate(pipeline_info, direction); let msg = ConstellationMsg::Navigate(pipeline_info, direction);