From f963ed99ac6b31b15da8c58cf45f142f93d001f1 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 15 Jul 2014 12:09:21 +0200 Subject: Rename variables that refer to global objects. This clarifies whether those variables will point to a Window object or an arbitrary global object. Note in particular that all IDL Constructors will accept an arbitrary global object. --- src/components/script/dom/bindings/utils.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/components/script/dom/bindings/utils.rs') diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 0c3375111ef..2e889898025 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -373,10 +373,10 @@ pub trait Reflectable { pub fn reflect_dom_object (obj: Box, - window: &JSRef, + global: &JSRef, wrap_fn: extern "Rust" fn(*mut JSContext, &JSRef, Box) -> Temporary) -> Temporary { - wrap_fn(window.get_cx(), window, obj) + wrap_fn(global.get_cx(), global, obj) } #[allow(raw_pointer_deriving)] -- cgit v1.2.3 From 954ab7a2e34913bbbbe71963b908a7105d8d69c3 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 15 Jul 2014 12:20:31 +0200 Subject: Simplify the implementation of cx_for_dom_reflector. --- src/components/script/dom/bindings/utils.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/components/script/dom/bindings/utils.rs') diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 2e889898025..4200cec0b20 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -591,12 +591,8 @@ pub fn global_object_for_js_object(obj: *mut JSObject) -> JS { } fn cx_for_dom_reflector(obj: *mut JSObject) -> *mut JSContext { - let win = global_object_for_js_object(obj).root(); - let js_info = win.deref().page().js_info(); - match *js_info { - Some(ref info) => info.js_context.deref().deref().ptr, - None => fail!("no JS context for DOM global") - } + let global = global_object_for_js_object(obj).root(); + global.get_cx() } pub fn cx_for_dom_object(obj: &T) -> *mut JSContext { -- cgit v1.2.3 From 829259fb794831167c9992bd6b1c71bf81bd8023 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 15 Jul 2014 13:30:19 +0200 Subject: Introduce abstractions for global scopes. Part of #2811. --- src/components/script/dom/bindings/utils.rs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/components/script/dom/bindings/utils.rs') diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 4200cec0b20..628debb24ea 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -5,7 +5,8 @@ use dom::bindings::codegen::PrototypeList; use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH; use dom::bindings::conversions::{FromJSValConvertible, IDLInterface}; -use dom::bindings::js::{JS, JSRef, Temporary, Root}; +use dom::bindings::global::{GlobalRef, GlobalField, WindowField}; +use dom::bindings::js::{JS, Temporary, Root}; use dom::bindings::trace::Untraceable; use dom::browsercontext; use dom::window; @@ -373,8 +374,8 @@ pub trait Reflectable { pub fn reflect_dom_object (obj: Box, - global: &JSRef, - wrap_fn: extern "Rust" fn(*mut JSContext, &JSRef, Box) -> Temporary) + global: &GlobalRef, + wrap_fn: extern "Rust" fn(*mut JSContext, &GlobalRef, Box) -> Temporary) -> Temporary { wrap_fn(global.get_cx(), global, obj) } @@ -580,19 +581,23 @@ pub extern fn outerize_global(_cx: *mut JSContext, obj: JSHandleObject) -> *mut } /// Returns the global object of the realm that the given JS object was created in. -pub fn global_object_for_js_object(obj: *mut JSObject) -> JS { +pub fn global_object_for_js_object(obj: *mut JSObject) -> GlobalField { unsafe { let global = GetGlobalForObjectCrossCompartment(obj); let clasp = JS_GetClass(global); assert!(((*clasp).flags & (JSCLASS_IS_DOMJSCLASS | JSCLASS_IS_GLOBAL)) != 0); - FromJSValConvertible::from_jsval(ptr::mut_null(), ObjectOrNullValue(global), ()) - .ok().expect("found DOM global that doesn't unwrap to Window") + match FromJSValConvertible::from_jsval(ptr::mut_null(), ObjectOrNullValue(global), ()) { + Ok(window) => return WindowField(window), + Err(_) => (), + } + + fail!("found DOM global that doesn't unwrap to Window") } } fn cx_for_dom_reflector(obj: *mut JSObject) -> *mut JSContext { let global = global_object_for_js_object(obj).root(); - global.get_cx() + global.root_ref().get_cx() } pub fn cx_for_dom_object(obj: &T) -> *mut JSContext { -- cgit v1.2.3