wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Work around weird behavior from JS_NewObject when we pass it a parent. bug 407289, r=jst sr=brendan

Browse Source
This commit is contained in:
mrbkap@gmail.com 2007-12-18 11:40:46 -08:00
parent 2a01021676
commit a4484eddc8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/xpconnect/src/XPCNativeWrapper.cpp
View File

@ -828,9 +828,12 @@ XPCNativeWrapperCtor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
printf("Creating new JSObject\n");
#endif
wrapperObj = ::JS_NewObject(cx, XPCNativeWrapper::GetJSClass(), nsnull,
wrappedNative->GetScope()->GetGlobalJSObject());
nsnull);
if (!wrapperObj || !::JS_SetPrototype(cx, wrapperObj, nsnull)) {
if (!wrapperObj ||
!::JS_SetParent(cx, wrapperObj,
wrappedNative->GetScope()->GetGlobalJSObject()) ||
!::JS_SetPrototype(cx, wrapperObj, nsnull)) {
// JS_NewObject already threw (or reported OOM).
return JS_FALSE;
}
@ -1104,13 +1107,14 @@ XPCNativeWrapper::GetNewOrUsed(JSContext *cx, XPCWrappedNative *wrapper)
::JS_LockGCThing(cx, nw_parent);
}
obj = ::JS_NewObject(cx, GetJSClass(), nsnull, nw_parent);
obj = ::JS_NewObject(cx, GetJSClass(), nsnull, nsnull);
if (lock) {
::JS_UnlockGCThing(cx, nw_parent);
}
if (!obj ||
!::JS_SetParent(cx, obj, nw_parent) ||
!::JS_SetPrivate(cx, obj, wrapper) ||
!::JS_SetPrototype(cx, obj, nsnull) ||
!::JS_SetReservedSlot(cx, obj, 0, INT_TO_JSVAL(FLAG_DEEP))) {