mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 751387 - Fix crash caused by out-of-bounds accesses in command line options handling. r=bholley (240670c35) - Bug 1162187 - Pass around AutoJSAPI instead of cx to give us more control over error handling. r=glandium (702954016) - Bug 1162187 - Factor out single line argument processing into a helper. r=glandium (56efce591) - Bug 1162187 - Use the AutoJSAPI machinery to handle xpcshell exceptions. r=glandium (162309001) - Bug 1162187 - Remove the custom XPCShell error reporter. r=glandium (523d84539) - Bug 1162187 - Remove ignoreReportedErrors. r=glandium (072f247a3) - Bug 1161590 - xpcshell needs to initialize graphics prefs so that GfxInfo::GetFeatureStatus can check preferences. r=ehsan (5a8415817) - Bug 1166243 - Remove build() function from js and xpc shells. r=bholley,r=efaust (8537f2259) - Bug 1182357 - Implement support for optional size_is for arrays passed from JS. r=mrbkap (0d22d3f34) - missing profiler parts of Bug 1092311 - Fix IndexedDB profiler markers and logging (a68567bbb) - Bug 1086999 - CSP: Asterisk (*) wildcard should not allow blob:, data:, or filesystem: when matching source expressions (r=fabrice,pauljt) (7757a92ae) - Bug 1105827 - Part 1: Add stub PermissionStatus implementation. r=baku (2bd4c1dd3) - Bug 635134 - Adds X11 run-time check for Gtk3 backend. r=karlt (7e9304f5e) - Bug 994541 - Enable BasicCompositor OMTC on linux. r=Bas (c9a266beb) - Bug 1105827 - Part 2: Add stub Permissions implementation. r=baku (751f5e9e6) - Bug 1105827 - Part 3: Implement Permissions.query. r=baku (a30a48cbe) - Bug 1105827 - Part 4: Add Navigator.permissions. r=baku (0d70fc5e6) - Bug 1174861 - Remove unnecessary Rooted from Prefable::isEnabled(). r=bholley (a0893081d)
This commit is contained in:
@@ -196,15 +196,6 @@ Version(JSContext *cx,
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
BuildDate(JSContext *cx, unsigned argc, JS::Value *vp)
|
||||
{
|
||||
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
|
||||
fprintf(stdout, "built on %s at %s\n", __DATE__, __TIME__);
|
||||
args.rval().setUndefined();
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
Quit(JSContext *cx,
|
||||
unsigned argc,
|
||||
@@ -274,7 +265,6 @@ const JSFunctionSpec gGlobalFunctions[] =
|
||||
JS_FS("load", Load, 1,0),
|
||||
JS_FS("quit", Quit, 0,0),
|
||||
JS_FS("version", Version, 1,0),
|
||||
JS_FS("build", BuildDate, 0,0),
|
||||
JS_FS("dumpXPC", DumpXPC, 1,0),
|
||||
JS_FS("dump", Dump, 1,0),
|
||||
JS_FS("gc", GC, 0,0),
|
||||
@@ -377,7 +367,7 @@ XPCShellEnvironment::ProcessFile(JSContext *cx,
|
||||
JSErrorReporter older;
|
||||
|
||||
ok = JS_ExecuteScript(cx, script, &result);
|
||||
if (ok && result != JSVAL_VOID) {
|
||||
if (ok && !result.isUndefined()) {
|
||||
/* Suppress error reports from JS::ToString(). */
|
||||
older = JS_SetErrorReporter(JS_GetRuntime(cx), nullptr);
|
||||
str = JS::ToString(cx, result);
|
||||
@@ -594,7 +584,7 @@ XPCShellEnvironment::EvaluateString(const nsString& aString,
|
||||
|
||||
JS::Rooted<JS::Value> result(cx);
|
||||
bool ok = JS_ExecuteScript(cx, script, &result);
|
||||
if (ok && result != JSVAL_VOID) {
|
||||
if (ok && !result.isUndefined()) {
|
||||
JSErrorReporter old = JS_SetErrorReporter(JS_GetRuntime(cx), nullptr);
|
||||
JSString* str = JS::ToString(cx, result);
|
||||
nsAutoJSString autoStr;
|
||||
|
||||
Reference in New Issue
Block a user