corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 996785 - Distinguish local and remote CPOW objects in IPDL (r=mrbkap)

Browse Source
This commit is contained in:
Bill McCloskey
2014-05-16 16:40:36 -07:00
parent 94e25e7956
commit 648513711d
7 changed files with 69 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/ipc/JavaScriptParent.cpp
View File

@@ -47,21 +47,25 @@ JavaScriptParent::init()
}
bool
JavaScriptParent::toId(JSContext *cx, JSObject *obj, ObjectId *idp)
JavaScriptParent::toObjectVariant(JSContext *cx, JSObject *obj, ObjectVariant *objVarp)
{
JS_ASSERT(obj);
obj = js::CheckedUnwrap(obj, false);
if (!obj || !IsCPOW(obj)) {
JS_ReportError(cx, "cannot ipc non-cpow object");
return false;
}
*idp = idOf(obj);
*objVarp = LocalObject(idOf(obj));
return true;
}
JSObject *
JavaScriptParent::fromId(JSContext *cx, ObjectId objId)
JavaScriptParent::fromObjectVariant(JSContext *cx, ObjectVariant objVar)
{
JS_ASSERT(objVar.type() == ObjectVariant::TRemoteObject);
ObjectId objId = objVar.get_RemoteObject().id();
RootedObject obj(cx, findCPOWById(objId));
if (obj) {
if (!JS_WrapObject(cx, &obj))