diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-01 17:24:54 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-06 20:59:13 +0200 |
commit | 27f100b1d47058b92d0e23d8c1b2e472fb0eafca (patch) | |
tree | 2f12c1364fe0b5abb9b7f1405be81e04023193dd /components/script/dom/browsingcontext.rs | |
parent | c6ff767625fff00e7c8f41d254c074e8e1e277be (diff) | |
download | servo-27f100b1d47058b92d0e23d8c1b2e472fb0eafca.tar.gz servo-27f100b1d47058b92d0e23d8c1b2e472fb0eafca.zip |
Introduce GlobalScope::pipeline_id
Diffstat (limited to 'components/script/dom/browsingcontext.rs')
-rw-r--r-- | components/script/dom/browsingcontext.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/script/dom/browsingcontext.rs b/components/script/dom/browsingcontext.rs index 9f867157fab..2ea6a1b78bd 100644 --- a/components/script/dom/browsingcontext.rs +++ b/components/script/dom/browsingcontext.rs @@ -4,6 +4,7 @@ use dom::bindings::cell::DOMRefCell; use dom::bindings::conversions::{ToJSValConvertible, root_from_handleobject}; +use dom::bindings::inheritance::Castable; use dom::bindings::js::{JS, MutNullableHeap, Root, RootedReference}; use dom::bindings::proxyhandler::{fill_property_descriptor, get_property_descriptor}; use dom::bindings::reflector::{Reflectable, MutReflectable, Reflector}; @@ -12,6 +13,7 @@ use dom::bindings::utils::WindowProxyHandler; use dom::bindings::utils::get_array_index_from_id; use dom::document::Document; use dom::element::Element; +use dom::globalscope::GlobalScope; use dom::window::Window; use js::JSCLASS_IS_GLOBAL; use js::glue::{CreateWrapperProxyHandler, ProxyTraps, NewWindowProxy}; @@ -150,7 +152,7 @@ impl BrowsingContext { pub fn find_child_by_id(&self, pipeline_id: PipelineId) -> Option<Root<Window>> { self.children.borrow().iter().find(|context| { let window = context.active_window(); - window.pipeline_id() == pipeline_id + window.upcast::<GlobalScope>().pipeline_id() == pipeline_id }).map(|context| context.active_window()) } |