Merge pull request #3477 from Ms2ger/global

Move global_object_for_js_object to global.rs

Reviewed-by: jdm

components/script/dom/bindings/callback.rs

@@ -4,9 +4,10 @@
 
 //! Base classes to work with IDL callbacks.
 
+use dom::bindings::global::global_object_for_js_object;
 use dom::bindings::js::JSRef;
 use dom::bindings::trace::Traceable;
-use dom::bindings::utils::{Reflectable, global_object_for_js_object};
+use dom::bindings::utils::Reflectable;
 use js::jsapi::{JSContext, JSObject, JS_WrapObject, JS_ObjectIsCallable};
 use js::jsapi::JS_GetProperty;
 use js::jsval::{JSVal, UndefinedValue};

components/script/dom/bindings/codegen/CodegenRust.py

@@ -4519,18 +4519,18 @@ class CGBindingRoot(CGThing):
             'dom::types::*',
             'dom::bindings',
             'dom::bindings::global::GlobalRef',
+            'dom::bindings::global::global_object_for_js_object',
             'dom::bindings::js::{JS, JSRef, Root, RootedReference, Temporary}',
             'dom::bindings::js::{OptionalRootable, OptionalRootedRootable, ResultRootable}',
             'dom::bindings::js::{OptionalRootedReference, OptionalOptionalRootedRootable}',
             'dom::bindings::utils::{CreateDOMGlobal, CreateInterfaceObjects2}',
-            'dom::bindings::utils::{ConstantSpec, cx_for_dom_object}',
+            'dom::bindings::utils::ConstantSpec',
             'dom::bindings::utils::{dom_object_slot, DOM_OBJECT_SLOT, DOMClass}',
             'dom::bindings::utils::{DOMJSClass, JSCLASS_DOM_GLOBAL}',
             'dom::bindings::utils::{FindEnumStringIndex, GetArrayIndexFromId}',
             'dom::bindings::utils::{GetPropertyOnPrototype, GetProtoOrIfaceArray}',
             'dom::bindings::utils::{HasPropertyOnPrototype, IntVal}',
             'dom::bindings::utils::{jsid_to_str}',
-            'dom::bindings::utils::global_object_for_js_object',
             'dom::bindings::utils::{Reflectable}',
             'dom::bindings::utils::{squirrel_away_unique}',
             'dom::bindings::utils::{ThrowingConstructor,  unwrap, unwrap_jsmanaged}',

components/script/dom/bindings/global.rs

@@ -7,6 +7,7 @@
 //! This module contains smart pointers to global scopes, to simplify writing
 //! code that works in workers as well as window scopes.
 
+use dom::bindings::conversions::FromJSValConvertible;
 use dom::bindings::js::{JS, JSRef, Root};
 use dom::bindings::utils::{Reflectable, Reflector};
 use dom::workerglobalscope::WorkerGlobalScope;
@@ -15,10 +16,15 @@ use script_task::ScriptChan;
 
 use servo_net::resource_task::ResourceTask;
 
-use js::jsapi::JSContext;
+use js::{JSCLASS_IS_GLOBAL, JSCLASS_IS_DOMJSCLASS};
-
+use js::glue::{GetGlobalForObjectCrossCompartment};
+use js::jsapi::{JSContext, JSObject};
+use js::jsapi::{JS_GetClass};
+use js::jsval::ObjectOrNullValue;
 use url::Url;
 
+use std::ptr;
+
 /// A freely-copyable reference to a rooted global object.
 pub enum GlobalRef<'a> {
     Window(JSRef<'a, Window>),
@@ -120,3 +126,24 @@ impl GlobalField {
         }
     }
 }
+
+/// Returns the global object of the realm that the given JS object was created in.
+#[allow(unrooted_must_root)]
+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);
+        match FromJSValConvertible::from_jsval(ptr::null_mut(), ObjectOrNullValue(global), ()) {
+            Ok(window) => return WindowField(window),
+            Err(_) => (),
+        }
+
+        match FromJSValConvertible::from_jsval(ptr::null_mut(), ObjectOrNullValue(global), ()) {
+            Ok(worker) => return WorkerField(worker),
+            Err(_) => (),
+        }
+
+        fail!("found DOM global that doesn't unwrap to Window or WorkerGlobalScope")
+    }
+}

components/script/dom/bindings/utils.rs

@@ -6,9 +6,9 @@
 
 use dom::bindings::codegen::PrototypeList;
 use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH;
-use dom::bindings::conversions::{FromJSValConvertible, IDLInterface};
+use dom::bindings::conversions::IDLInterface;
 use dom::bindings::error::throw_type_error;
-use dom::bindings::global::{GlobalRef, GlobalField, WindowField, WorkerField};
+use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JS, Temporary, Root};
 use dom::bindings::trace::Untraceable;
 use dom::browsercontext;
@@ -23,7 +23,7 @@ use std::cmp::PartialEq;
 use std::ptr;
 use std::slice;
 use js::glue::{js_IsObjectProxyClass, js_IsFunctionProxyClass, IsProxyHandlerFamily};
-use js::glue::{GetGlobalForObjectCrossCompartment, UnwrapObject, GetProxyHandlerExtra};
+use js::glue::{UnwrapObject, GetProxyHandlerExtra};
 use js::glue::{IsWrapper, RUST_JSID_TO_STRING, RUST_JSID_IS_INT};
 use js::glue::{RUST_JSID_IS_STRING, RUST_JSID_TO_INT};
 use js::jsapi::{JS_AlreadyHasOwnProperty, JS_NewFunction};
@@ -43,12 +43,11 @@ use js::jsapi::JS_DeletePropertyById2;
 use js::jsfriendapi::JS_ObjectToOuterObject;
 use js::jsfriendapi::bindgen::JS_NewObjectWithUniqueType;
 use js::jsval::JSVal;
-use js::jsval::{PrivateValue, ObjectValue, NullValue, ObjectOrNullValue};
+use js::jsval::{PrivateValue, ObjectValue, NullValue};
 use js::jsval::{Int32Value, UInt32Value, DoubleValue, BooleanValue, UndefinedValue};
 use js::rust::with_compartment;
-use js::{JSPROP_ENUMERATE, JSCLASS_IS_GLOBAL, JSCLASS_IS_DOMJSCLASS};
+use js::{JSPROP_ENUMERATE, JSPROP_READONLY, JSPROP_PERMANENT};
-use js::JSPROP_PERMANENT;
+use js::JSFUN_CONSTRUCTOR;
-use js::{JSFUN_CONSTRUCTOR, JSPROP_READONLY};
 use js;
 
 #[allow(raw_pointer_deriving)]
@@ -664,42 +663,6 @@ 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.
-#[allow(unrooted_must_root)]
-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);
-        match FromJSValConvertible::from_jsval(ptr::null_mut(), ObjectOrNullValue(global), ()) {
-            Ok(window) => return WindowField(window),
-            Err(_) => (),
-        }
-
-        match FromJSValConvertible::from_jsval(ptr::null_mut(), ObjectOrNullValue(global), ()) {
-            Ok(worker) => return WorkerField(worker),
-            Err(_) => (),
-        }
-
-        fail!("found DOM global that doesn't unwrap to Window or WorkerGlobalScope")
-    }
-}
-
-/// Get the `JSContext` for the `JSRuntime` associated with the thread
-/// this object is on.
-#[allow(unrooted_must_root)]
-fn cx_for_dom_reflector(obj: *mut JSObject) -> *mut JSContext {
-    let global = global_object_for_js_object(obj);
-    let global = global.root();
-    global.root_ref().get_cx()
-}
-
-/// Get the `JSContext` for the `JSRuntime` associated with the thread
-/// this DOM object is on.
-pub fn cx_for_dom_object<T: Reflectable>(obj: &T) -> *mut JSContext {
-    cx_for_dom_reflector(obj.reflector().get_jsobject())
-}
-
 pub unsafe fn delete_property_by_id(cx: *mut JSContext, object: *mut JSObject,
                                     id: jsid, bp: &mut bool) -> bool {
     let mut value = UndefinedValue();