aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmliframeelement.rs
diff options
context:
space:
mode:
authorAlan Jeffrey <ajeffrey@mozilla.com>2017-05-12 15:02:35 -0500
committerAlan Jeffrey <ajeffrey@mozilla.com>2017-05-12 15:02:35 -0500
commit43ca26068935e014b1a41a6a02f45d05436577b4 (patch)
tree8959640c08455fa76d0c58f1bc2e3fcd67b1a637 /components/script/dom/htmliframeelement.rs
parenteeb1ee9723777b0dc04e919556826eef628363fe (diff)
downloadservo-43ca26068935e014b1a41a6a02f45d05436577b4.tar.gz
servo-43ca26068935e014b1a41a6a02f45d05436577b4.zip
Renamed BrowsingContext to WindowProxy in script.
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
-rw-r--r--components/script/dom/htmliframeelement.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index e1a7fb7c672..bee9f1a50c7 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -23,7 +23,6 @@ use dom::bindings::js::{LayoutJS, MutNullableJS, Root};
use dom::bindings::refcounted::Trusted;
use dom::bindings::reflector::DomObject;
use dom::bindings::str::DOMString;
-use dom::browsingcontext::BrowsingContext;
use dom::customevent::CustomEvent;
use dom::document::Document;
use dom::domtokenlist::DOMTokenList;
@@ -35,6 +34,7 @@ use dom::htmlelement::HTMLElement;
use dom::node::{Node, NodeDamage, UnbindContext, document_from_node, window_from_node};
use dom::virtualmethods::VirtualMethods;
use dom::window::{ReflowReason, Window};
+use dom::windowproxy::WindowProxy;
use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix};
use ipc_channel::ipc;
@@ -497,8 +497,8 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {
}
// https://html.spec.whatwg.org/multipage/#dom-iframe-contentwindow
- fn GetContentWindow(&self) -> Option<Root<BrowsingContext>> {
- self.pipeline_id.get().and_then(|_| ScriptThread::find_browsing_context(self.frame_id))
+ fn GetContentWindow(&self) -> Option<Root<WindowProxy>> {
+ self.pipeline_id.get().and_then(|_| ScriptThread::find_window_proxy(self.frame_id))
}
// https://html.spec.whatwg.org/multipage/#dom-iframe-contentdocument
@@ -726,7 +726,7 @@ impl VirtualMethods for HTMLIFrameElement {
// when the `PipelineExit` message arrives.
for exited_pipeline_id in exited_pipeline_ids {
if let Some(exited_document) = ScriptThread::find_document(exited_pipeline_id) {
- exited_document.window().browsing_context().discard();
+ exited_document.window().window_proxy().discard_browsing_context();
for exited_iframe in exited_document.iter_iframes() {
exited_iframe.pipeline_id.set(None);
}