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

Avoid unnecessary JS_WrapValue calls for DOM reflectors.

Browse source
This commit is contained in:
Josh Matthews 2016-07-11 16:56:04 -04:00
parent 184b1ba91b
commit 7539eb496b
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/script/dom/bindings/conversions.rs
View file

@ -47,9 +47,9 @@ use js::glue::{RUST_JSID_IS_STRING, RUST_JSID_TO_STRING, UnwrapObject};
use js::jsapi::{HandleId, HandleObject, HandleValue, JSClass, JSContext}; use js::jsapi::{HandleId, HandleObject, HandleValue, JSClass, JSContext};
use js::jsapi::{JSObject, JSString, JS_GetArrayBufferViewType, JS_GetClass}; use js::jsapi::{JSObject, JSString, JS_GetArrayBufferViewType, JS_GetClass};
use js::jsapi::{JS_GetLatin1StringCharsAndLength, JS_GetObjectAsArrayBufferView}; use js::jsapi::{JS_GetLatin1StringCharsAndLength, JS_GetObjectAsArrayBufferView};
use js::jsapi::{JS_GetReservedSlot, JS_GetTwoByteStringCharsAndLength}; use js::jsapi::{JS_GetReservedSlot, JS_GetTwoByteStringCharsAndLength, ToWindowProxyIfWindow};
use js::jsapi::{JS_IsArrayObject, JS_NewStringCopyN, JS_StringHasLatin1Chars}; use js::jsapi::{JS_IsArrayObject, JS_NewStringCopyN, JS_StringHasLatin1Chars};
use js::jsapi::{JS_WrapValue, MutableHandleValue, Type}; use js::jsapi::{JS_WrapValue, MutableHandleValue, Type, IsObjectInContextCompartment};
use js::jsval::{ObjectValue, StringValue}; use js::jsval::{ObjectValue, StringValue};
use js::rust::ToString; use js::rust::ToString;
use libc; use libc;
@ -276,9 +276,15 @@ impl ToJSValConvertible for Reflector {
unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) {
let obj = self.get_jsobject().get(); let obj = self.get_jsobject().get();
assert!(!obj.is_null()); assert!(!obj.is_null());
rval.set(ObjectValue(&*obj)); let same_compartment = IsObjectInContextCompartment(obj, cx);
if !JS_WrapValue(cx, rval) { if same_compartment {
panic!("JS_WrapValue failed."); rval.set(ObjectValue(&*ToWindowProxyIfWindow(obj)));
} else {
rval.set(ObjectValue(&*obj));
if !JS_WrapValue(cx, rval) {
panic!("JS_WrapValue failed.");
}
} }
} }
} }