Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove global_root_from_reflector

Browse source
This commit is contained in:
Anthony Ramine 2016-10-05 01:01:22 +02:00
parent 1fed45e393
commit 26455b8a67
4 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/dom/bindings/callback.rs
View file

@ -5,7 +5,7 @@
//! Base classes to work with IDL callbacks. //! Base classes to work with IDL callbacks.
use dom::bindings::error::{Error, Fallible, report_pending_exception}; use dom::bindings::error::{Error, Fallible, report_pending_exception};
use dom::bindings::global::global_root_from_object; use dom::bindings::global::global_scope_from_object;
use dom::bindings::reflector::Reflectable; use dom::bindings::reflector::Reflectable;
use js::jsapi::{Heap, MutableHandleObject, RootedObject}; use js::jsapi::{Heap, MutableHandleObject, RootedObject};
use js::jsapi::{IsCallable, JSContext, JSObject, JS_WrapObject}; use js::jsapi::{IsCallable, JSContext, JSObject, JS_WrapObject};
@ -165,8 +165,8 @@ impl<'a> CallSetup<'a> {
callback: &T, callback: &T,
handling: ExceptionHandling) handling: ExceptionHandling)
-> CallSetup<'a> { -> CallSetup<'a> {
let global = unsafe { global_root_from_object(callback.callback()) }; let global = unsafe { global_scope_from_object(callback.callback()) };
let cx = global.r().get_cx(); let cx = global.get_cx();
exception_compartment.ptr = unsafe { exception_compartment.ptr = unsafe {
GetGlobalForObjectCrossCompartment(callback.callback()) GetGlobalForObjectCrossCompartment(callback.callback())

1
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -5502,7 +5502,6 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries
'dom::bindings::global::GlobalRef', 'dom::bindings::global::GlobalRef',
'dom::bindings::global::global_root_from_object', 'dom::bindings::global::global_root_from_object',
'dom::bindings::global::global_root_from_object_maybe_wrapped', 'dom::bindings::global::global_root_from_object_maybe_wrapped',
'dom::bindings::global::global_root_from_reflector',
'dom::bindings::global::global_scope_from_reflector', 'dom::bindings::global::global_scope_from_reflector',
'dom::bindings::interface::ConstructorClassHook', 'dom::bindings::interface::ConstructorClassHook',
'dom::bindings::interface::InterfaceConstructorBehavior', 'dom::bindings::interface::InterfaceConstructorBehavior',

5
components/script/dom/bindings/global.rs
View file

@ -111,11 +111,6 @@ pub fn global_scope_from_reflector<T: Reflectable>(reflector: &T) -> Root<Global
unsafe { global_scope_from_object(*reflector.reflector().get_jsobject()) } unsafe { global_scope_from_object(*reflector.reflector().get_jsobject()) }
} }
/// Returns the global object of the realm that the given DOM object's reflector was created in.
pub fn global_root_from_reflector<T: Reflectable>(reflector: &T) -> GlobalRoot {
unsafe { global_root_from_object(*reflector.reflector().get_jsobject()) }
}
/// Returns the Rust global scope from a JS global object. /// Returns the Rust global scope from a JS global object.
unsafe fn global_scope_from_global(global: *mut JSObject) -> Root<GlobalScope> { unsafe fn global_scope_from_global(global: *mut JSObject) -> Root<GlobalScope> {
assert!(!global.is_null()); assert!(!global.is_null());

4
components/script/dom/bindings/reflector.rs
View file

@ -5,7 +5,7 @@
//! The `Reflector` struct. //! The `Reflector` struct.
use dom::bindings::conversions::DerivedFrom; use dom::bindings::conversions::DerivedFrom;
use dom::bindings::global::{GlobalRoot, global_root_from_reflector, global_scope_from_reflector}; use dom::bindings::global::{GlobalRoot, global_root_from_object, global_scope_from_reflector};
use dom::bindings::js::Root; use dom::bindings::js::Root;
use dom::globalscope::GlobalScope; use dom::globalscope::GlobalScope;
use js::jsapi::{HandleObject, JSContext, JSObject}; use js::jsapi::{HandleObject, JSContext, JSObject};
@ -87,7 +87,7 @@ pub trait Reflectable {
/// Returns the global object of the realm that the Reflectable was created in. /// Returns the global object of the realm that the Reflectable was created in.
fn global(&self) -> GlobalRoot where Self: Sized { fn global(&self) -> GlobalRoot where Self: Sized {
global_root_from_reflector(self) unsafe { global_root_from_object(*self.reflector().get_jsobject()) }
} }
} }