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

Backed out changeset 66d4205c2958 (bug 1212533) for build bustage ON A CLOSED TREE

Browse Source
This commit is contained in:
Nigel Babu
2016-01-26 13:08:20 +05:30
parent ca84560231
commit 2035d2fb72
17 changed files with 47 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/ipc/WrapperAnswer.cpp
View File

@@ -425,15 +425,13 @@ WrapperAnswer::RecvCallOrConstruct(const ObjectId& objId,
ContextOptionsRef(cx).setDontReportUncaught(true);
HandleValueArray args = HandleValueArray::subarray(vals, 2, vals.length() - 2);
if (construct) {
RootedObject obj(cx);
if (!JS::Construct(cx, vals[0], args, &obj))
return fail(aes, rs);
rval.setObject(*obj);
} else {
if(!JS::Call(cx, vals[1], vals[0], args, &rval))
return fail(aes, rs);
}
bool success;
if (construct)
success = JS::Construct(cx, vals[0], args, &rval);
else
success = JS::Call(cx, vals[1], vals[0], args, &rval);
if (!success)
return fail(aes, rs);
}
if (!toVariant(cx, rval, result))