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

Bug 720580 - Factor out the call to PostCreatePrototype into a helper method. r=mrbkap

Browse Source
This commit is contained in:
Bobby Holley 2012-03-05 15:22:44 -08:00
parent 9afaa4890f
commit ea2172967e
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
js/xpconnect/src/XPCWrappedNativeProto.cpp
View File

@ -127,24 +127,37 @@ XPCWrappedNativeProto::Init(XPCCallContext& ccx,
mScope->GetPrototypeJSObject(),
true, parent);
JSBool ok = !!mJSProtoObject;
if (ok) {
bool success = !!mJSProtoObject;
if (success) {
JS_SetPrivate(mJSProtoObject, this);
if (callback) {
nsresult rv = callback->PostCreatePrototype(ccx, mJSProtoObject);
if (NS_FAILED(rv)) {
JS_SetPrivate(mJSProtoObject, nsnull);
mJSProtoObject = nsnull;
XPCThrower::Throw(rv, ccx);
return false;
}
}
success = CallPostCreatePrototype(ccx);
}
DEBUG_ReportShadowedMembers(mSet, nsnull, this);
return ok;
return success;
}
bool
XPCWrappedNativeProto::CallPostCreatePrototype(XPCCallContext& ccx)
{
// Nothing to do if we don't have a scriptable callback.
nsIXPCScriptable *callback = mScriptableInfo ? mScriptableInfo->GetCallback()
: nsnull;
if (!callback)
return true;
// Call the helper. This can handle being called if it's not implemented,
// so we don't have to check any sort of "want" here. See xpc_map_end.h.
nsresult rv = callback->PostCreatePrototype(ccx, mJSProtoObject);
if (NS_FAILED(rv)) {
JS_SetPrivate(mJSProtoObject, nsnull);
mJSProtoObject = nsnull;
XPCThrower::Throw(rv, ccx);
return false;
}
return true;
}
void

1
js/xpconnect/src/xpcprivate.h
View File

@ -2283,6 +2283,7 @@ public:
void SetScriptableInfo(XPCNativeScriptableInfo* si)
{NS_ASSERTION(!mScriptableInfo, "leak here!"); mScriptableInfo = si;}
bool CallPostCreatePrototype(XPCCallContext& ccx);
void JSProtoObjectFinalized(JSContext *cx, JSObject *obj);
void SystemIsBeingShutDown();