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

15
js/ipc/JavaScriptChild.cpp
View File

@@ -71,16 +71,13 @@ JavaScriptChild::RecvDropObject(const ObjectId &objId)
}
bool
JavaScriptChild::toId(JSContext *cx, JSObject *obj, ObjectId *idp)
JavaScriptChild::toObjectVariant(JSContext *cx, JSObject *obj, ObjectVariant *objVarp)
{
if (!obj) {
*idp = 0;
return true;
}
JS_ASSERT(obj);
ObjectId id = ids_.find(obj);
if (id) {
*idp = id;
*objVarp = RemoteObject(id);
return true;
}
@@ -99,13 +96,15 @@ JavaScriptChild::toId(JSContext *cx, JSObject *obj, ObjectId *idp)
if (!ids_.add(cx, obj, id))
return false;
*idp = id;
*objVarp = RemoteObject(id);
return true;
}
JSObject *
JavaScriptChild::fromId(JSContext *cx, ObjectId id)
JavaScriptChild::fromObjectVariant(JSContext *cx, ObjectVariant objVar)
{
JS_ASSERT(objVar.type() == ObjectVariant::TLocalObject);
ObjectId id = objVar.get_LocalObject().id();
JSObject *obj = findObjectById(id);
MOZ_ASSERT(obj);
return obj;