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

Properly root expando objects.

Browse source
This commit is contained in:
Ms2ger 2017-02-07 11:24:12 +01:00
parent bf814aa5ba
commit bd431039b9
2 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2510,7 +2510,8 @@ def CopyUnforgeablePropertiesToInstance(descriptor):
# reflector, so we can make sure we don't get confused by named getters. # reflector, so we can make sure we don't get confused by named getters.
if descriptor.proxy: if descriptor.proxy:
copyCode += """\ copyCode += """\
rooted!(in(cx) let expando = ensure_expando_object(cx, obj.handle())); rooted!(in(cx) let mut expando = ptr::null_mut());
ensure_expando_object(cx, obj.handle(), expando.handle_mut());
""" """
obj = "expando" obj = "expando"
else: else:
@ -4850,7 +4851,8 @@ if RUST_JSID_IS_STRING(id) {
# FIXME(#11868) Should assign to desc.obj, desc.get() is a copy. # FIXME(#11868) Should assign to desc.obj, desc.get() is a copy.
return get + """\ return get + """\
rooted!(in(cx) let expando = get_expando_object(proxy)); rooted!(in(cx) let mut expando = ptr::null_mut());
get_expando_object(proxy, expando.handle_mut());
//if (!xpc::WrapperFactory::IsXrayWrapper(proxy) && (expando = GetExpandoObject(proxy))) { //if (!xpc::WrapperFactory::IsXrayWrapper(proxy) && (expando = GetExpandoObject(proxy))) {
if !expando.is_null() { if !expando.is_null() {
if !JS_GetPropertyDescriptorById(cx, expando.handle(), id, desc) { if !JS_GetPropertyDescriptorById(cx, expando.handle(), id, desc) {
@ -4981,10 +4983,10 @@ class CGDOMJSProxyHandler_ownPropertyKeys(CGAbstractExternMethod):
body += dedent( body += dedent(
""" """
let expando = get_expando_object(proxy); rooted!(in(cx) let mut expando = ptr::null_mut());
get_expando_object(proxy, expando.handle_mut());
if !expando.is_null() { if !expando.is_null() {
rooted!(in(cx) let rooted_expando = expando); GetPropertyKeys(cx, expando.handle(), JSITER_OWNONLY | JSITER_HIDDEN | JSITER_SYMBOLS, props);
GetPropertyKeys(cx, rooted_expando.handle(), JSITER_OWNONLY | JSITER_HIDDEN | JSITER_SYMBOLS, props);
} }
return true; return true;
@ -5024,10 +5026,10 @@ class CGDOMJSProxyHandler_getOwnEnumerablePropertyKeys(CGAbstractExternMethod):
body += dedent( body += dedent(
""" """
let expando = get_expando_object(proxy); rooted!(in(cx) let mut expando = ptr::null_mut());
get_expando_object(proxy, expando.handle_mut());
if !expando.is_null() { if !expando.is_null() {
rooted!(in(cx) let rooted_expando = expando); GetPropertyKeys(cx, expando.handle(), JSITER_OWNONLY | JSITER_HIDDEN | JSITER_SYMBOLS, props);
GetPropertyKeys(cx, rooted_expando.handle(), JSITER_OWNONLY | JSITER_HIDDEN | JSITER_SYMBOLS, props);
} }
return true; return true;
@ -5080,7 +5082,8 @@ if RUST_JSID_IS_STRING(id) {
named = "" named = ""
return indexed + """\ return indexed + """\
rooted!(in(cx) let expando = get_expando_object(proxy)); rooted!(in(cx) let mut expando = ptr::null_mut());
get_expando_object(proxy, expando.handle_mut());
if !expando.is_null() { if !expando.is_null() {
let ok = JS_HasPropertyById(cx, expando.handle(), id, bp); let ok = JS_HasPropertyById(cx, expando.handle(), id, bp);
if !ok || *bp { if !ok || *bp {
@ -5105,7 +5108,8 @@ class CGDOMJSProxyHandler_get(CGAbstractExternMethod):
def getBody(self): def getBody(self):
getFromExpando = """\ getFromExpando = """\
rooted!(in(cx) let expando = get_expando_object(proxy)); rooted!(in(cx) let mut expando = ptr::null_mut());
get_expando_object(proxy, expando.handle_mut());
if !expando.is_null() { if !expando.is_null() {
let mut hasProp = false; let mut hasProp = false;
if !JS_HasPropertyById(cx, expando.handle(), id, &mut hasProp) { if !JS_HasPropertyById(cx, expando.handle(), id, &mut hasProp) {

24
components/script/dom/bindings/proxyhandler.rs
View file

@ -33,7 +33,8 @@ pub unsafe extern "C" fn shadow_check_callback(cx: *mut JSContext,
-> DOMProxyShadowsResult { -> DOMProxyShadowsResult {
// TODO: support OverrideBuiltins when #12978 is fixed. // TODO: support OverrideBuiltins when #12978 is fixed.
rooted!(in(cx) let expando = get_expando_object(object)); rooted!(in(cx) let mut expando = ptr::null_mut());
get_expando_object(object, expando.handle_mut());
if !expando.get().is_null() { if !expando.get().is_null() {
let mut has_own = false; let mut has_own = false;
if !JS_AlreadyHasOwnPropertyById(cx, expando.handle(), id, &mut has_own) { if !JS_AlreadyHasOwnPropertyById(cx, expando.handle(), id, &mut has_own) {
@ -99,7 +100,8 @@ pub unsafe extern "C" fn define_property(cx: *mut JSContext,
return true; return true;
} }
rooted!(in(cx) let expando = ensure_expando_object(cx, proxy)); rooted!(in(cx) let mut expando = ptr::null_mut());
ensure_expando_object(cx, proxy, expando.handle_mut());
JS_DefinePropertyById(cx, expando.handle(), id, desc, result) JS_DefinePropertyById(cx, expando.handle(), id, desc, result)
} }
@ -109,7 +111,8 @@ pub unsafe extern "C" fn delete(cx: *mut JSContext,
id: HandleId, id: HandleId,
bp: *mut ObjectOpResult) bp: *mut ObjectOpResult)
-> bool { -> bool {
rooted!(in(cx) let expando = get_expando_object(proxy)); rooted!(in(cx) let mut expando = ptr::null_mut());
get_expando_object(proxy, expando.handle_mut());
if expando.is_null() { if expando.is_null() {
(*bp).code_ = 0 /* OkCode */; (*bp).code_ = 0 /* OkCode */;
return true; return true;
@ -156,31 +159,30 @@ pub unsafe extern "C" fn get_prototype_if_ordinary(_: *mut JSContext,
} }
/// Get the expando object, or null if there is none. /// Get the expando object, or null if there is none.
pub fn get_expando_object(obj: HandleObject) -> *mut JSObject { pub fn get_expando_object(obj: HandleObject, expando: MutableHandleObject) {
unsafe { unsafe {
assert!(is_dom_proxy(obj.get())); assert!(is_dom_proxy(obj.get()));
let val = GetProxyExtra(obj.get(), JSPROXYSLOT_EXPANDO); let val = GetProxyExtra(obj.get(), JSPROXYSLOT_EXPANDO);
if val.is_undefined() { expando.set(if val.is_undefined() {
ptr::null_mut() ptr::null_mut()
} else { } else {
val.to_object() val.to_object()
} });
} }
} }
/// Get the expando object, or create it if it doesn't exist yet. /// Get the expando object, or create it if it doesn't exist yet.
/// Fails on JSAPI failure. /// Fails on JSAPI failure.
pub fn ensure_expando_object(cx: *mut JSContext, obj: HandleObject) -> *mut JSObject { pub fn ensure_expando_object(cx: *mut JSContext, obj: HandleObject, expando: MutableHandleObject) {
unsafe { unsafe {
assert!(is_dom_proxy(obj.get())); assert!(is_dom_proxy(obj.get()));
let mut expando = get_expando_object(obj); get_expando_object(obj, expando);
if expando.is_null() { if expando.is_null() {
expando = JS_NewObjectWithGivenProto(cx, ptr::null_mut(), HandleObject::null()); expando.set(JS_NewObjectWithGivenProto(cx, ptr::null_mut(), HandleObject::null()));
assert!(!expando.is_null()); assert!(!expando.is_null());
SetProxyExtra(obj.get(), JSPROXYSLOT_EXPANDO, &ObjectValue(expando)); SetProxyExtra(obj.get(), JSPROXYSLOT_EXPANDO, &ObjectValue(expando.get()));
} }
expando
} }
} }