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

Use global_scope_from_object in Window::global_is_mozbrowser

Browse source
This commit is contained in:
Anthony Ramine 2016-10-04 16:25:44 +02:00
parent 4d9347d5b3
commit 1fed45e393
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/script/dom/window.rs
View file

@ -17,7 +17,7 @@ use dom::bindings::codegen::Bindings::WindowBinding::{self, FrameRequestCallback
use dom::bindings::codegen::Bindings::WindowBinding::{ScrollBehavior, ScrollToOptions}; use dom::bindings::codegen::Bindings::WindowBinding::{ScrollBehavior, ScrollToOptions};
use dom::bindings::codegen::UnionTypes::RequestOrUSVString; use dom::bindings::codegen::UnionTypes::RequestOrUSVString;
use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::error::{Error, ErrorResult, Fallible};
use dom::bindings::global::{GlobalRef, global_root_from_object}; use dom::bindings::global::global_scope_from_object;
use dom::bindings::inheritance::Castable; use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::bindings::js::{JS, MutNullableHeap, Root};
use dom::bindings::num::Finite; use dom::bindings::num::Finite;
@ -1496,10 +1496,9 @@ impl Window {
/// in a top-level `Window` global. /// in a top-level `Window` global.
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub unsafe fn global_is_mozbrowser(_: *mut JSContext, obj: HandleObject) -> bool { pub unsafe fn global_is_mozbrowser(_: *mut JSContext, obj: HandleObject) -> bool {
match global_root_from_object(obj.get()).r() { global_scope_from_object(obj.get())
GlobalRef::Window(window) => window.is_mozbrowser(), .downcast::<Window>()
_ => false, .map_or(false, |window| window.is_mozbrowser())
}
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]