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

Merge pull request #3347 from jdm/blankiframe

Browse source 
Make all iframes attached to a document default to about:blank.
This commit is contained in:
Jack Moffitt 2014-09-15 19:37:29 -06:00
commit 8a02fe0fc6
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,29 +82,29 @@ impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> {
} }
fn process_the_iframe_attributes(&self) { fn process_the_iframe_attributes(&self) {
match self.get_url() { let url = match self.get_url() {
Some(url) => { Some(url) => url.clone(),
let sandboxed = if self.is_sandboxed() { None => Url::parse("about:blank").unwrap(),
IFrameSandboxed };
} else {
IFrameUnsandboxed
};
// Subpage Id let sandboxed = if self.is_sandboxed() {
let window = window_from_node(self).root(); IFrameSandboxed
let page = window.deref().page(); } else {
let subpage_id = page.get_next_subpage_id(); IFrameUnsandboxed
};
self.deref().size.deref().set(Some(IFrameSize { // Subpage Id
pipeline_id: page.id, let window = window_from_node(self).root();
subpage_id: subpage_id, let page = window.deref().page();
})); let subpage_id = page.get_next_subpage_id();
let ConstellationChan(ref chan) = *page.constellation_chan.deref(); self.deref().size.deref().set(Some(IFrameSize {
chan.send(LoadIframeUrlMsg(url, page.id, subpage_id, sandboxed)); pipeline_id: page.id,
} subpage_id: subpage_id,
_ => () }));
}
let ConstellationChan(ref chan) = *page.constellation_chan.deref();
chan.send(LoadIframeUrlMsg(url, page.id, subpage_id, sandboxed));
} }
} }