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

Bug 880330 - Remove the old options API; r=bholley

Browse Source
This commit is contained in:
Eddy Bruel
2013-10-28 12:59:04 +01:00
parent 9dabe0567d
commit 298842135f
3 changed files with 14 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
js/ipc/JavaScriptChild.cpp
View File

@@ -496,16 +496,15 @@ JavaScriptChild::AnswerCall(const ObjectId &objId, const nsTArray<JSParam> &argv
}
}
uint32_t oldOpts =
JS_SetOptions(cx, JS_GetOptions(cx) | JSOPTION_DONT_REPORT_UNCAUGHT);
RootedValue rval(cx);
bool success = JS::Call(cx, vals[1], vals[0], vals.length() - 2, vals.begin() + 2, &rval);
{
AutoSaveContextOptions asco(cx);
ContextOptionsRef(cx).setDontReportUncaught(true);
JS_SetOptions(cx, oldOpts);
if (!success)
return fail(cx, rs);
bool success = JS::Call(cx, vals[1], vals[0], vals.length() - 2, vals.begin() + 2, &rval);
if (!success)
return fail(cx, rs);
}
if (!toVariant(cx, rval, result))
return fail(cx, rs);