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

Sync XPCSafeJSObjectWrapper with similar fixes that we took for XPCNativeWrapper. bug 399299, r+sr=jst

Browse Source
This commit is contained in:
mrbkap@gmail.com 2007-12-18 15:33:14 -08:00
parent 3f624418e5
commit 62ccffd6aa
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/src/xpconnect/src/XPCSafeJSObjectWrapper.cpp
View File

@ -204,11 +204,6 @@ JS_STATIC_DLL_CALLBACK(JSBool)
XPC_SJOW_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, XPC_SJOW_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
jsval *rval); jsval *rval);
static JSFunctionSpec sXPC_SJOW_JSClass_methods[] = {
{"toString", XPC_SJOW_toString, 0, 0, 0},
{0, 0, 0, 0, 0}
};
// Reserved slot indexes on safe wrappers. // Reserved slot indexes on safe wrappers.
// Boolean value, initialized to false on object creation and true // Boolean value, initialized to false on object creation and true
@ -621,7 +616,9 @@ XPC_SJOW_NewResolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
{ {
// No need to resolve toString as it's a class method. // No need to resolve toString as it's a class method.
if (id == GetRTStringByIndex(cx, XPCJSRuntime::IDX_TO_STRING)) { if (id == GetRTStringByIndex(cx, XPCJSRuntime::IDX_TO_STRING)) {
return JS_TRUE; *objp = obj;
return JS_DefineFunction(cx, obj, "toString",
XPC_SJOW_toString, 0, 0) != nsnull;
} }
obj = FindSafeObject(cx, obj); obj = FindSafeObject(cx, obj);
@ -897,9 +894,11 @@ XPC_SJOW_Construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
// Don't use the object the JS engine created for us, it is in most // Don't use the object the JS engine created for us, it is in most
// cases incorectly parented and has a proto from the wrong scope. // cases incorectly parented and has a proto from the wrong scope.
JSObject *wrapperObj = ::JS_NewObject(cx, &sXPC_SJOW_JSClass.base, nsnull, JSObject *wrapperObj = ::JS_NewObject(cx, &sXPC_SJOW_JSClass.base, nsnull,
objToWrap); nsnull);
if (!wrapperObj) { if (!wrapperObj ||
!::JS_SetPrototype(cx, wrapperObj, nsnull) ||
!::JS_SetParent(cx, wrapperObj, objToWrap)) {
// JS_NewObject already threw. // JS_NewObject already threw.
return JS_FALSE; return JS_FALSE;
} }
@ -994,8 +993,7 @@ XPC_SJOW_AttachNewConstructorObject(XPCCallContext &ccx,
JSObject *class_obj = JSObject *class_obj =
::JS_InitClass(ccx, aGlobalObject, nsnull, &sXPC_SJOW_JSClass.base, ::JS_InitClass(ccx, aGlobalObject, nsnull, &sXPC_SJOW_JSClass.base,
XPC_SJOW_Construct, 0, nsnull, sXPC_SJOW_JSClass_methods, XPC_SJOW_Construct, 0, nsnull, nsnull, nsnull, nsnull);
nsnull, nsnull);
if (!class_obj) { if (!class_obj) {
NS_WARNING("can't initialize the XPCSafeJSObjectWrapper class"); NS_WARNING("can't initialize the XPCSafeJSObjectWrapper class");
return PR_FALSE; return PR_FALSE;