mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Bug 1148962 - Use TakeOwnershipOfErrorReporting in CPOW code (r=bholley)
This commit is contained in:
Bill McCloskey
parent
a41f905187
commit
11851d2c88
@ -27,7 +27,7 @@ using mozilla::dom::AutoJSAPI;
|
||||
using mozilla::dom::AutoEntryScript;
|
||||
|
||||
bool
|
||||
WrapperAnswer::fail(JSContext* cx, ReturnStatus* rs)
|
||||
WrapperAnswer::fail(AutoJSAPI& jsapi, ReturnStatus* rs)
|
||||
{
|
||||
// By default, we set |undefined| unless we can get a more meaningful
|
||||
// exception.
|
||||
@ -37,14 +37,12 @@ WrapperAnswer::fail(JSContext* cx, ReturnStatus* rs)
|
||||
// to the IPC code, and we don't want a JS failure to cause the death
|
||||
// of the child process.
|
||||
|
||||
JSContext* cx = jsapi.cx();
|
||||
RootedValue exn(cx);
|
||||
if (!JS_GetPendingException(cx, &exn))
|
||||
if (!jsapi.HasException())
|
||||
return true;
|
||||
|
||||
// If we don't clear the pending exception, JS will try to wrap it as it
|
||||
// leaves the current compartment. Since there is no previous compartment,
|
||||
// that would crash.
|
||||
JS_ClearPendingException(cx);
|
||||
jsapi.StealException(&exn);
|
||||
|
||||
if (JS_IsStopIteration(exn)) {
|
||||
*rs = ReturnStatus(ReturnStopIteration());
|
||||
@ -79,15 +77,16 @@ WrapperAnswer::RecvPreventExtensions(const ObjectId& objId, ReturnStatus* rs)
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
ObjectOpResult success;
|
||||
if (!JS_PreventExtensions(cx, obj, success))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("%s.preventExtensions()", ReceiverObj(objId));
|
||||
return ok(rs, success);
|
||||
@ -110,25 +109,26 @@ WrapperAnswer::RecvGetPropertyDescriptor(const ObjectId& objId, const JSIDVarian
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
EmptyDesc(out);
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("%s.getPropertyDescriptor(%s)", ReceiverObj(objId), Identifier(idVar));
|
||||
|
||||
RootedId id(cx);
|
||||
if (!fromJSIDVariant(cx, idVar, &id))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
Rooted<JSPropertyDescriptor> desc(cx);
|
||||
if (!JS_GetPropertyDescriptorById(cx, obj, id, &desc))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
if (!fromDescriptor(cx, desc, out))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
return ok(rs);
|
||||
}
|
||||
@ -140,25 +140,26 @@ WrapperAnswer::RecvGetOwnPropertyDescriptor(const ObjectId& objId, const JSIDVar
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
EmptyDesc(out);
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("%s.getOwnPropertyDescriptor(%s)", ReceiverObj(objId), Identifier(idVar));
|
||||
|
||||
RootedId id(cx);
|
||||
if (!fromJSIDVariant(cx, idVar, &id))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
Rooted<JSPropertyDescriptor> desc(cx);
|
||||
if (!JS_GetOwnPropertyDescriptorById(cx, obj, id, &desc))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
if (!fromDescriptor(cx, desc, out))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
return ok(rs);
|
||||
}
|
||||
@ -170,25 +171,26 @@ WrapperAnswer::RecvDefineProperty(const ObjectId& objId, const JSIDVariant& idVa
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("define %s[%s]", ReceiverObj(objId), Identifier(idVar));
|
||||
|
||||
RootedId id(cx);
|
||||
if (!fromJSIDVariant(cx, idVar, &id))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
Rooted<JSPropertyDescriptor> desc(cx);
|
||||
if (!toDescriptor(cx, descriptor, &desc))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
ObjectOpResult success;
|
||||
if (!js::DefineOwnProperty(cx, obj, id, desc, success))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
return ok(rs, success);
|
||||
}
|
||||
|
||||
@ -198,21 +200,22 @@ WrapperAnswer::RecvDelete(const ObjectId& objId, const JSIDVariant& idVar, Retur
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("delete %s[%s]", ReceiverObj(objId), Identifier(idVar));
|
||||
|
||||
RootedId id(cx);
|
||||
if (!fromJSIDVariant(cx, idVar, &id))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
ObjectOpResult success;
|
||||
if (!JS_DeletePropertyById(cx, obj, id, success))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
return ok(rs, success);
|
||||
}
|
||||
|
||||
@ -222,22 +225,23 @@ WrapperAnswer::RecvHas(const ObjectId& objId, const JSIDVariant& idVar, ReturnSt
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
*bp = false;
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("%s.has(%s)", ReceiverObj(objId), Identifier(idVar));
|
||||
|
||||
RootedId id(cx);
|
||||
if (!fromJSIDVariant(cx, idVar, &id))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
bool found;
|
||||
if (!JS_HasPropertyById(cx, obj, id, &found))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
*bp = !!found;
|
||||
|
||||
return ok(rs);
|
||||
@ -250,22 +254,23 @@ WrapperAnswer::RecvHasOwn(const ObjectId& objId, const JSIDVariant& idVar, Retur
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
*bp = false;
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("%s.hasOwn(%s)", ReceiverObj(objId), Identifier(idVar));
|
||||
|
||||
RootedId id(cx);
|
||||
if (!fromJSIDVariant(cx, idVar, &id))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
Rooted<JSPropertyDescriptor> desc(cx);
|
||||
if (!JS_GetPropertyDescriptorById(cx, obj, id, &desc))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
*bp = (desc.object() == obj);
|
||||
|
||||
return ok(rs);
|
||||
@ -277,6 +282,7 @@ WrapperAnswer::RecvGet(const ObjectId& objId, const ObjectVariant& receiverVar,
|
||||
{
|
||||
// We may run scripted getters.
|
||||
AutoEntryScript aes(xpc::NativeGlobal(scopeForTargetObjects()));
|
||||
aes.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = aes.cx();
|
||||
|
||||
// The outparam will be written to the buffer, so it must be set even if
|
||||
@ -285,22 +291,22 @@ WrapperAnswer::RecvGet(const ObjectId& objId, const ObjectVariant& receiverVar,
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
RootedObject receiver(cx, fromObjectVariant(cx, receiverVar));
|
||||
if (!receiver)
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
RootedId id(cx);
|
||||
if (!fromJSIDVariant(cx, idVar, &id))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
JS::RootedValue val(cx);
|
||||
if (!JS_ForwardGetPropertyTo(cx, obj, id, receiver, &val))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
if (!toVariant(cx, val, result))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
LOG("get %s.%s = %s", ReceiverObj(objId), Identifier(idVar), OutVariant(*result));
|
||||
|
||||
@ -313,29 +319,30 @@ WrapperAnswer::RecvSet(const ObjectId& objId, const JSIDVariant& idVar, const JS
|
||||
{
|
||||
// We may run scripted setters.
|
||||
AutoEntryScript aes(xpc::NativeGlobal(scopeForTargetObjects()));
|
||||
aes.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = aes.cx();
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
LOG("set %s[%s] = %s", ReceiverObj(objId), Identifier(idVar), InVariant(value));
|
||||
|
||||
RootedId id(cx);
|
||||
if (!fromJSIDVariant(cx, idVar, &id))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
RootedValue val(cx);
|
||||
if (!fromVariant(cx, value, &val))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
RootedValue receiver(cx);
|
||||
if (!fromVariant(cx, receiverVar, &receiver))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
ObjectOpResult result;
|
||||
if (!JS_ForwardSetPropertyTo(cx, obj, id, val, receiver, result))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
return ok(rs, result);
|
||||
}
|
||||
@ -346,18 +353,19 @@ WrapperAnswer::RecvIsExtensible(const ObjectId& objId, ReturnStatus* rs, bool* r
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
*result = false;
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("%s.isExtensible()", ReceiverObj(objId));
|
||||
|
||||
bool extensible;
|
||||
if (!JS_IsExtensible(cx, obj, &extensible))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
*result = !!extensible;
|
||||
return ok(rs);
|
||||
@ -372,6 +380,7 @@ WrapperAnswer::RecvCallOrConstruct(const ObjectId& objId,
|
||||
nsTArray<JSParam>* outparams)
|
||||
{
|
||||
AutoEntryScript aes(xpc::NativeGlobal(scopeForTargetObjects()));
|
||||
aes.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = aes.cx();
|
||||
|
||||
// The outparam will be written to the buffer, so it must be set even if
|
||||
@ -380,13 +389,13 @@ WrapperAnswer::RecvCallOrConstruct(const ObjectId& objId,
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
MOZ_ASSERT(argv.Length() >= 2);
|
||||
|
||||
RootedValue objv(cx);
|
||||
if (!fromVariant(cx, argv[0], &objv))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
*result = JSVariant(UndefinedVariant());
|
||||
|
||||
@ -397,17 +406,17 @@ WrapperAnswer::RecvCallOrConstruct(const ObjectId& objId,
|
||||
// This is an outparam.
|
||||
RootedObject obj(cx, xpc::NewOutObject(cx));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
if (!outobjects.append(ObjectValue(*obj)))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
if (!vals.append(ObjectValue(*obj)))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
} else {
|
||||
RootedValue v(cx);
|
||||
if (!fromVariant(cx, argv[i].get_JSVariant(), &v))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
if (!vals.append(v))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
}
|
||||
}
|
||||
|
||||
@ -423,11 +432,11 @@ WrapperAnswer::RecvCallOrConstruct(const ObjectId& objId,
|
||||
else
|
||||
success = JS::Call(cx, vals[1], vals[0], args, &rval);
|
||||
if (!success)
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
}
|
||||
|
||||
if (!toVariant(cx, rval, result))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
|
||||
// Prefill everything with a dummy jsval.
|
||||
for (size_t i = 0; i < outobjects.length(); i++)
|
||||
@ -444,12 +453,12 @@ WrapperAnswer::RecvCallOrConstruct(const ObjectId& objId,
|
||||
bool found;
|
||||
if (JS_HasProperty(cx, obj, "value", &found)) {
|
||||
if (!JS_GetProperty(cx, obj, "value", &v))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
} else {
|
||||
v = UndefinedValue();
|
||||
}
|
||||
if (!vals.append(v))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
}
|
||||
|
||||
// Copy the outparams. If any outparam is already set to a void_t, we
|
||||
@ -457,7 +466,7 @@ WrapperAnswer::RecvCallOrConstruct(const ObjectId& objId,
|
||||
for (size_t i = 0; i < vals.length(); i++) {
|
||||
JSVariant variant;
|
||||
if (!toVariant(cx, vals[i], &variant))
|
||||
return fail(cx, rs);
|
||||
return fail(aes, rs);
|
||||
outparams->ReplaceElementAt(i, JSParam(variant));
|
||||
}
|
||||
|
||||
@ -472,20 +481,21 @@ WrapperAnswer::RecvHasInstance(const ObjectId& objId, const JSVariant& vVar, Ret
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("%s.hasInstance(%s)", ReceiverObj(objId), InVariant(vVar));
|
||||
|
||||
RootedValue val(cx);
|
||||
if (!fromVariant(cx, vVar, &val))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
if (!JS_HasInstance(cx, obj, val, bp))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
return ok(rs);
|
||||
}
|
||||
@ -497,6 +507,7 @@ WrapperAnswer::RecvObjectClassIs(const ObjectId& objId, const uint32_t& classVal
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
@ -518,6 +529,7 @@ WrapperAnswer::RecvClassName(const ObjectId& objId, nsCString* name)
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
@ -540,18 +552,19 @@ WrapperAnswer::RecvGetPrototype(const ObjectId& objId, ReturnStatus* rs, ObjectO
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
JS::RootedObject proto(cx);
|
||||
if (!JS_GetPrototype(cx, obj, &proto))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
if (!toObjectOrNullVariant(cx, proto, result))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("getPrototype(%s)", ReceiverObj(objId));
|
||||
|
||||
@ -565,19 +578,20 @@ WrapperAnswer::RecvRegExpToShared(const ObjectId& objId, ReturnStatus* rs,
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
MOZ_RELEASE_ASSERT(JS_ObjectIsRegExp(cx, obj));
|
||||
RootedString sourceJSStr(cx, JS_GetRegExpSource(cx, obj));
|
||||
if (!sourceJSStr)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
nsAutoJSString sourceStr;
|
||||
if (!sourceStr.init(cx, sourceJSStr))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
source->Assign(sourceStr);
|
||||
|
||||
*flags = JS_GetRegExpFlags(cx, obj);
|
||||
@ -592,22 +606,23 @@ WrapperAnswer::RecvGetPropertyKeys(const ObjectId& objId, const uint32_t& flags,
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("%s.getPropertyKeys()", ReceiverObj(objId));
|
||||
|
||||
AutoIdVector props(cx);
|
||||
if (!js::GetPropertyKeys(cx, obj, flags, &props))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
for (size_t i = 0; i < props.length(); i++) {
|
||||
JSIDVariant id;
|
||||
if (!toJSIDVariant(cx, props[i], &id))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
ids->AppendElement(id);
|
||||
}
|
||||
@ -622,13 +637,14 @@ WrapperAnswer::RecvInstanceOf(const ObjectId& objId, const JSIID& iid, ReturnSta
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
|
||||
*instanceof = false;
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("%s.instanceOf()", ReceiverObj(objId));
|
||||
|
||||
@ -637,7 +653,7 @@ WrapperAnswer::RecvInstanceOf(const ObjectId& objId, const JSIID& iid, ReturnSta
|
||||
|
||||
nsresult rv = xpc::HasInstance(cx, obj, &nsiid, instanceof);
|
||||
if (rv != NS_OK)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
return ok(rs);
|
||||
}
|
||||
@ -649,18 +665,19 @@ WrapperAnswer::RecvDOMInstanceOf(const ObjectId& objId, const int& prototypeID,
|
||||
AutoJSAPI jsapi;
|
||||
if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
|
||||
return false;
|
||||
jsapi.TakeOwnershipOfErrorReporting();
|
||||
JSContext* cx = jsapi.cx();
|
||||
*instanceof = false;
|
||||
|
||||
RootedObject obj(cx, findObjectById(cx, objId));
|
||||
if (!obj)
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
|
||||
LOG("%s.domInstanceOf()", ReceiverObj(objId));
|
||||
|
||||
bool tmp;
|
||||
if (!mozilla::dom::InterfaceHasInstance(cx, prototypeID, depth, obj, &tmp))
|
||||
return fail(cx, rs);
|
||||
return fail(jsapi, rs);
|
||||
*instanceof = tmp;
|
||||
|
||||
return ok(rs);
|
||||
|
||||
@ -11,6 +11,11 @@
|
||||
#include "JavaScriptShared.h"
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
namespace dom {
|
||||
class AutoJSAPI;
|
||||
}
|
||||
|
||||
namespace jsipc {
|
||||
|
||||
class WrapperAnswer : public virtual JavaScriptShared
|
||||
@ -62,7 +67,7 @@ class WrapperAnswer : public virtual JavaScriptShared
|
||||
bool RecvDropObject(const ObjectId& objId);
|
||||
|
||||
private:
|
||||
bool fail(JSContext* cx, ReturnStatus* rs);
|
||||
bool fail(dom::AutoJSAPI& jsapi, ReturnStatus* rs);
|
||||
bool ok(ReturnStatus* rs);
|
||||
bool ok(ReturnStatus* rs, const JS::ObjectOpResult& result);
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user