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

Bug 925534 - Convert toVariant to use handles, r=terrence

Browse Source
This commit is contained in:
Steve Fink
2013-10-11 22:02:24 -07:00
parent 0aae270303
commit 37e60e9737
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/ipc/JavaScriptChild.cpp
View File

@@ -132,9 +132,9 @@ JavaScriptChild::fail(JSContext *cx, ReturnStatus *rs)
return true;
}
if (!toVariant(cx, exn, &rs->get_ReturnException().exn()))
return true;
// If this fails, we still don't want to exit. Just return an invalid
// exception.
(void) toVariant(cx, exn, &rs->get_ReturnException().exn());
return true;
}
@@ -377,7 +377,7 @@ JavaScriptChild::AnswerGet(const ObjectId &objId, const ObjectId &receiverId, co
if (!convertGeckoStringToId(cx, id, &internedId))
return fail(cx, rs);
JS::Rooted<JS::Value> val(cx);
JS::RootedValue val(cx);
if (!JS_ForwardGetPropertyTo(cx, obj, internedId, receiver, &val))
return fail(cx, rs);
@@ -537,7 +537,7 @@ JavaScriptChild::AnswerCall(const ObjectId &objId, const nsTArray<JSParam> &argv
// treat this as the outparam never having been set.
for (size_t i = 0; i < vals.length(); i++) {
JSVariant variant;
if (!toVariant(cx, vals[i], &variant))
if (!toVariant(cx, vals.handleAt(i), &variant))
return fail(cx, rs);
outparams->ReplaceElementAt(i, JSParam(variant));
}