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

move reserved slot setting for DOM globals

Browse source 
Moving this slot setting prior to initializing standard classes and
other initialization tasks means that we can effectively use JS_GC_ZEAL.

Fixes #6057.
This commit is contained in:
Nathan Froyd 2015-10-27 14:14:11 -04:00
parent 3d39646c8e
commit c82b6ce843
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2163,12 +2163,10 @@ let obj = RootedObject::new(cx, obj);\
" create_dom_global(\n" " create_dom_global(\n"
" cx,\n" " cx,\n"
" &Class.base as *const js::jsapi::Class as *const JSClass,\n" " &Class.base as *const js::jsapi::Class as *const JSClass,\n"
" raw as *const libc::c_void,\n"
" Some(%s))\n" " Some(%s))\n"
");\n" ");\n"
"assert!(!obj.ptr.is_null());\n" "assert!(!obj.ptr.is_null());" % TRACE_HOOK_NAME)
"\n"
"JS_SetReservedSlot(obj.ptr, DOM_OBJECT_SLOT,\n"
" PrivateValue(raw as *const libc::c_void));" % TRACE_HOOK_NAME)
else: else:
create += ("let obj = {\n" create += ("let obj = {\n"
" let _ac = JSAutoCompartment::new(cx, proto.ptr);\n" " let _ac = JSAutoCompartment::new(cx, proto.ptr);\n"

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

@ -9,7 +9,7 @@ use dom::bindings::codegen::PrototypeList;
use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH; use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH;
use dom::bindings::conversions::native_from_handleobject; use dom::bindings::conversions::native_from_handleobject;
use dom::bindings::conversions::private_from_proto_check; use dom::bindings::conversions::private_from_proto_check;
use dom::bindings::conversions::{is_dom_class, jsstring_to_str}; use dom::bindings::conversions::{is_dom_class, jsstring_to_str, DOM_OBJECT_SLOT};
use dom::bindings::error::throw_type_error; use dom::bindings::error::throw_type_error;
use dom::bindings::error::{Error, ErrorResult, Fallible, throw_invalid_this}; use dom::bindings::error::{Error, ErrorResult, Fallible, throw_invalid_this};
use dom::bindings::global::GlobalRef; use dom::bindings::global::GlobalRef;
@ -625,6 +625,7 @@ pub fn has_property_on_prototype(cx: *mut JSContext, proxy: HandleObject,
/// Create a DOM global object with the given class. /// Create a DOM global object with the given class.
pub fn create_dom_global(cx: *mut JSContext, class: *const JSClass, pub fn create_dom_global(cx: *mut JSContext, class: *const JSClass,
private: *const libc::c_void,
trace: JSTraceOp) trace: JSTraceOp)
-> *mut JSObject { -> *mut JSObject {
unsafe { unsafe {
@ -640,6 +641,7 @@ pub fn create_dom_global(cx: *mut JSContext, class: *const JSClass,
return ptr::null_mut(); return ptr::null_mut();
} }
let _ac = JSAutoCompartment::new(cx, obj.ptr); let _ac = JSAutoCompartment::new(cx, obj.ptr);
JS_SetReservedSlot(obj.ptr, DOM_OBJECT_SLOT, PrivateValue(private));
JS_InitStandardClasses(cx, obj.handle()); JS_InitStandardClasses(cx, obj.handle());
initialize_global(obj.ptr); initialize_global(obj.ptr);
JS_FireOnNewGlobalObject(cx, obj.handle()); JS_FireOnNewGlobalObject(cx, obj.handle());