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

Auto merge of #6299 - GreenRecycleBin:#6271, r=Ms2ger

Browse source 
get_proto_or_iface_array now returns *mut ProtoOrIfaceArray

Fix #6271

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6299)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-07 10:47:14 -05:00
commit ca6a34a1cd
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2165,11 +2165,11 @@ assert!(((*JS_GetClass(global)).flags & JSCLASS_DOM_GLOBAL) != 0);
/* Check to see whether the interface objects are already installed */ /* Check to see whether the interface objects are already installed */
let proto_or_iface_array = get_proto_or_iface_array(global); let proto_or_iface_array = get_proto_or_iface_array(global);
let cached_object: *mut JSObject = *proto_or_iface_array.offset(%s as isize); let cached_object: *mut JSObject = (*proto_or_iface_array)[%s as usize];
if cached_object.is_null() { if cached_object.is_null() {
let tmp: *mut JSObject = CreateInterfaceObjects(cx, global, receiver); let tmp: *mut JSObject = CreateInterfaceObjects(cx, global, receiver);
assert!(!tmp.is_null()); assert!(!tmp.is_null());
*proto_or_iface_array.offset(%s as isize) = tmp; (*proto_or_iface_array)[%s as usize] = tmp;
tmp tmp
} else { } else {
cached_object cached_object

11
components/script/dom/bindings/utils.rs
View file

@ -156,10 +156,10 @@ unsafe impl Sync for DOMJSClass {}
/// Returns the ProtoOrIfaceArray for the given global object. /// Returns the ProtoOrIfaceArray for the given global object.
/// Fails if `global` is not a DOM global object. /// Fails if `global` is not a DOM global object.
pub fn get_proto_or_iface_array(global: *mut JSObject) -> *mut *mut JSObject { pub fn get_proto_or_iface_array(global: *mut JSObject) -> *mut ProtoOrIfaceArray {
unsafe { unsafe {
assert!(((*JS_GetClass(global)).flags & JSCLASS_DOM_GLOBAL) != 0); assert!(((*JS_GetClass(global)).flags & JSCLASS_DOM_GLOBAL) != 0);
JS_GetReservedSlot(global, DOM_PROTOTYPE_SLOT).to_private() as *mut *mut JSObject JS_GetReservedSlot(global, DOM_PROTOTYPE_SLOT).to_private() as *mut ProtoOrIfaceArray
} }
} }
@ -330,7 +330,8 @@ pub unsafe extern fn throwing_constructor(cx: *mut JSContext, _argc: c_uint,
return 0; return 0;
} }
type ProtoOrIfaceArray = [*mut JSObject; PrototypeList::ID::Count as usize]; /// An array of *mut JSObject of size PrototypeList::ID::Count
pub type ProtoOrIfaceArray = [*mut JSObject; PrototypeList::ID::Count as usize];
/// Construct and cache the ProtoOrIfaceArray for the given global. /// Construct and cache the ProtoOrIfaceArray for the given global.
/// Fails if the argument is not a DOM global. /// Fails if the argument is not a DOM global.
@ -594,12 +595,12 @@ pub fn create_dom_global(cx: *mut JSContext, class: *const JSClass)
/// Drop the resources held by reserved slots of a global object /// Drop the resources held by reserved slots of a global object
pub unsafe fn finalize_global(obj: *mut JSObject) { pub unsafe fn finalize_global(obj: *mut JSObject) {
let _: Box<ProtoOrIfaceArray> = let _: Box<ProtoOrIfaceArray> =
Box::from_raw(get_proto_or_iface_array(obj) as *mut ProtoOrIfaceArray); Box::from_raw(get_proto_or_iface_array(obj));
} }
/// Trace the resources held by reserved slots of a global object /// Trace the resources held by reserved slots of a global object
pub unsafe fn trace_global(tracer: *mut JSTracer, obj: *mut JSObject) { pub unsafe fn trace_global(tracer: *mut JSTracer, obj: *mut JSObject) {
let array = get_proto_or_iface_array(obj) as *mut ProtoOrIfaceArray; let array = get_proto_or_iface_array(obj);
for &proto in (*array).iter() { for &proto in (*array).iter() {
if !proto.is_null() { if !proto.is_null() {
trace_object(tracer, "prototype", proto); trace_object(tracer, "prototype", proto);