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

Rename {get,set}_wrapper to {get,set}_jsobject. v1

Browse source
This commit is contained in:
Bobby Holley 2013-10-08 20:40:45 +02:00
parent 62ddac8b6f
commit 6bf740d967
12 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2525,7 +2525,7 @@ class CGWrapWithCacheMethod(CGAbstractMethod):
//NS_ADDREF(aObject); //NS_ADDREF(aObject);
(*reflector).set_wrapper(obj); (*reflector).set_jsobject(obj);
return obj;""" % (CreateBindingJSObject(self.descriptor, "parent")) return obj;""" % (CreateBindingJSObject(self.descriptor, "parent"))
else: else:
@ -2533,7 +2533,7 @@ class CGWrapWithCacheMethod(CGAbstractMethod):
%s %s
let proto = GetProtoObject(aCx, obj, obj); let proto = GetProtoObject(aCx, obj, obj);
JS_SetPrototype(aCx, obj, proto); JS_SetPrototype(aCx, obj, proto);
(*reflector).set_wrapper(obj); (*reflector).set_jsobject(obj);
return obj;""" % CreateBindingJSObject(self.descriptor) return obj;""" % CreateBindingJSObject(self.descriptor)
class CGWrapMethod(CGAbstractMethod): class CGWrapMethod(CGAbstractMethod):
@ -4077,7 +4077,7 @@ class CGClassConstructHook(CGAbstractExternMethod):
// from the context for now. // from the context for now.
let page = page_from_context(cx); let page = page_from_context(cx);
let global = (*page).frame.get_ref().window; let global = (*page).frame.get_ref().window;
let obj = global.reflector().get_wrapper(); let obj = global.reflector().get_jsobject();
""" """
preArgs = ["global"] preArgs = ["global"]

4
src/components/script/dom/bindings/node.rs
View file

@ -119,7 +119,7 @@ impl Traceable for Node<ScriptView> {
debug!("tracing %s", name); debug!("tracing %s", name);
let mut node = node.unwrap(); let mut node = node.unwrap();
let cache = node.reflector(); let cache = node.reflector();
let wrapper = cache.get_wrapper(); let wrapper = cache.get_jsobject();
assert!(wrapper.is_not_null()); assert!(wrapper.is_not_null());
unsafe { unsafe {
(*tracer).debugPrinter = ptr::null(); (*tracer).debugPrinter = ptr::null();
@ -130,7 +130,7 @@ impl Traceable for Node<ScriptView> {
} }
} }
} }
debug!("tracing %p?:", self.wrapper.get_wrapper()); debug!("tracing %p?:", self.wrapper.get_jsobject());
trace_node(tracer, self.parent_node, "parent"); trace_node(tracer, self.parent_node, "parent");
trace_node(tracer, self.first_child, "first child"); trace_node(tracer, self.first_child, "first child");
trace_node(tracer, self.last_child, "last child"); trace_node(tracer, self.last_child, "last child");

14
src/components/script/dom/bindings/utils.rs
View file

@ -537,11 +537,11 @@ pub struct Reflector {
} }
impl Reflector { impl Reflector {
pub fn get_wrapper(&self) -> *JSObject { pub fn get_jsobject(&self) -> *JSObject {
unsafe { cast::transmute(self.wrapper) } unsafe { cast::transmute(self.wrapper) }
} }
pub fn set_wrapper(&mut self, wrapper: *JSObject) { pub fn set_jsobject(&mut self, wrapper: *JSObject) {
self.wrapper = wrapper; self.wrapper = wrapper;
} }
@ -562,7 +562,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject,
vp: *mut JSVal) -> JSBool { vp: *mut JSVal) -> JSBool {
unsafe { unsafe {
let cache = value.reflector(); let cache = value.reflector();
let obj = cache.get_wrapper(); let obj = cache.get_jsobject();
if obj.is_not_null() /*&& js::GetObjectCompartment(obj) == js::GetObjectCompartment(scope)*/ { if obj.is_not_null() /*&& js::GetObjectCompartment(obj) == js::GetObjectCompartment(scope)*/ {
*vp = RUST_OBJECT_TO_JSVAL(obj); *vp = RUST_OBJECT_TO_JSVAL(obj);
return 1; // JS_TRUE return 1; // JS_TRUE
@ -574,7 +574,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject,
} }
// MOZ_ASSERT(js::IsObjectInContextCompartment(scope, cx)); // MOZ_ASSERT(js::IsObjectInContextCompartment(scope, cx));
cache.set_wrapper(obj); cache.set_jsobject(obj);
*vp = RUST_OBJECT_TO_JSVAL(obj); *vp = RUST_OBJECT_TO_JSVAL(obj);
return JS_WrapValue(cx, cast::transmute(vp)); return JS_WrapValue(cx, cast::transmute(vp));
} }
@ -585,12 +585,12 @@ pub fn WrapNativeParent(cx: *JSContext, scope: *JSObject, mut p: Option<@mut Ref
match p { match p {
Some(ref mut p) => { Some(ref mut p) => {
let cache = p.reflector(); let cache = p.reflector();
let wrapper = cache.get_wrapper(); let wrapper = cache.get_jsobject();
if wrapper.is_not_null() { if wrapper.is_not_null() {
return wrapper; return wrapper;
} }
let wrapper = p.wrap_object_shared(cx, scope); let wrapper = p.wrap_object_shared(cx, scope);
cache.set_wrapper(wrapper); cache.set_jsobject(wrapper);
wrapper wrapper
} }
None => unsafe { JS_GetGlobalObject(cx) } None => unsafe { JS_GetGlobalObject(cx) }
@ -735,7 +735,7 @@ impl DerivedWrapper for AbstractNode<ScriptView> {
#[fixed_stack_segment] #[fixed_stack_segment]
fn wrap(&mut self, cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 { fn wrap(&mut self, cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 {
let cache = self.reflector(); let cache = self.reflector();
let wrapper = cache.get_wrapper(); let wrapper = cache.get_jsobject();
if wrapper.is_not_null() { if wrapper.is_not_null() {
unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) }; unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) };
return 1; return 1;

4
src/components/script/dom/document.rs
View file

@ -163,7 +163,7 @@ impl DerivedWrapper for AbstractDocument {
#[fixed_stack_segment] #[fixed_stack_segment]
fn wrap(&mut self, _cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 { fn wrap(&mut self, _cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 {
let cache = self.reflector(); let cache = self.reflector();
let wrapper = cache.get_wrapper(); let wrapper = cache.get_jsobject();
unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) }; unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) };
return 1; return 1;
} }
@ -230,7 +230,7 @@ impl Document {
let win = self.window.get_ref(); let win = self.window.get_ref();
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let cache = win.reflector();
let scope = cache.get_wrapper(); let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }

2
src/components/script/dom/domparser.rs
View file

@ -28,7 +28,7 @@ impl DOMParser {
// TODO(tkuehn): This just handles the top-level page. Need to handle subframes. // TODO(tkuehn): This just handles the top-level page. Need to handle subframes.
let cx = owner.page.js_info.get_ref().js_compartment.cx.ptr; let cx = owner.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = owner.reflector(); let cache = owner.reflector();
let scope = cache.get_wrapper(); let scope = cache.get_jsobject();
parser.wrap_object_shared(cx, scope); parser.wrap_object_shared(cx, scope);
parser parser
} }

6
src/components/script/dom/element.rs
View file

@ -192,7 +192,7 @@ impl<'self> Element {
let win = doc.with_base(|doc| doc.window.unwrap()); let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let cache = win.reflector();
let scope = cache.get_wrapper(); let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }
} }
@ -288,7 +288,7 @@ impl Element {
ContentBoxesResponse(rects) => { ContentBoxesResponse(rects) => {
let cx = page.js_info.get_ref().js_compartment.cx.ptr; let cx = page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let cache = win.reflector();
let scope = cache.get_wrapper(); let scope = cache.get_jsobject();
let rects = do rects.map |r| { let rects = do rects.map |r| {
ClientRect::new( ClientRect::new(
r.origin.y.to_f32(), r.origin.y.to_f32(),
@ -316,7 +316,7 @@ impl Element {
ContentBoxResponse(rect) => { ContentBoxResponse(rect) => {
let cx = page.js_info.get_ref().js_compartment.cx.ptr; let cx = page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let cache = win.reflector();
let scope = cache.get_wrapper(); let scope = cache.get_jsobject();
ClientRect::new( ClientRect::new(
rect.origin.y.to_f32(), rect.origin.y.to_f32(),
(rect.origin.y + rect.size.height).to_f32(), (rect.origin.y + rect.size.height).to_f32(),

2
src/components/script/dom/htmldatalistelement.rs
View file

@ -18,7 +18,7 @@ impl HTMLDataListElement {
let win = doc.with_base(|doc| doc.window.unwrap()); let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let cache = win.reflector();
let scope = cache.get_wrapper(); let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }

2
src/components/script/dom/htmldocument.rs
View file

@ -37,7 +37,7 @@ impl HTMLDocument {
let win = self.parent.window.get_ref(); let win = self.parent.window.get_ref();
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let cache = win.reflector();
let scope = cache.get_wrapper(); let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }
} }

2
src/components/script/dom/htmlfieldsetelement.rs
View file

@ -44,7 +44,7 @@ impl HTMLFieldSetElement {
let win = doc.with_base(|doc| doc.window.unwrap()); let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let cache = win.reflector();
let scope = cache.get_wrapper(); let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }

2
src/components/script/dom/htmlformelement.rs
View file

@ -20,7 +20,7 @@ impl HTMLFormElement {
let win = doc.with_base(|doc| doc.window.unwrap()); let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let cache = win.reflector();
let scope = cache.get_wrapper(); let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }

2
src/components/script/dom/htmlmapelement.rs
View file

@ -25,7 +25,7 @@ impl HTMLMapElement {
let win = doc.with_base(|doc| doc.window.unwrap()); let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let cache = win.reflector();
let scope = cache.get_wrapper(); let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }

2
src/components/script/script_task.rs
View file

@ -707,7 +707,7 @@ impl ScriptTask {
self.chan.clone(), self.chan.clone(),
self.compositor, self.compositor,
self.image_cache_task.clone()); self.image_cache_task.clone());
page.initialize_js_info(cx, window.reflector().get_wrapper()); page.initialize_js_info(cx, window.reflector().get_jsobject());
RegisterBindings::Register(page.js_info.get_ref().js_compartment); RegisterBindings::Register(page.js_info.get_ref().js_compartment);