wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1162187 - Pass around AutoJSAPI instead of cx to give us more control over error handling. r=glandium

Browse Source
This commit is contained in:
Bobby Holley 2015-05-12 11:18:34 -07:00
parent 22f7f328aa
commit f7099a790f
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/xpconnect/src/XPCShellImpl.cpp
View File

@ -60,6 +60,8 @@
using namespace mozilla;
using namespace JS;
using mozilla::dom::AutoJSAPI;
using mozilla::dom::AutoEntryScript;
class XPCShellDirProvider : public nsIDirectoryServiceProvider2
{
@ -831,8 +833,9 @@ my_GetErrorMessage(void* userRef, const unsigned errorNumber)
}
static void
ProcessFile(JSContext* cx, const char* filename, FILE* file, bool forceTTY)
ProcessFile(AutoJSAPI& jsapi, const char* filename, FILE* file, bool forceTTY)
{
JSContext* cx = jsapi.cx();
JS::RootedScript script(cx);
JS::RootedValue result(cx);
int lineno, startline;
@ -863,7 +866,6 @@ ProcessFile(JSContext* cx, const char* filename, FILE* file, bool forceTTY)
}
}
ungetc(ch, file);
JS_BeginRequest(cx);
JS::CompileOptions options(cx);
options.setUTF8(true)
@ -871,7 +873,6 @@ ProcessFile(JSContext* cx, const char* filename, FILE* file, bool forceTTY)
.setIsRunOnce(true);
if (JS::Compile(cx, options, file, &script) && !compileOnly)
(void)JS_ExecuteScript(cx, script, &result);
JS_EndRequest(cx);
return;
}
@ -899,7 +900,6 @@ ProcessFile(JSContext* cx, const char* filename, FILE* file, bool forceTTY)
lineno++;
} while (!JS_BufferIsCompilableUnit(cx, global, buffer, strlen(buffer)));
JS_BeginRequest(cx);
/* Clear any pending exception from previous failed compiles. */
JS_ClearPendingException(cx);
JS::CompileOptions options(cx);
@ -923,14 +923,13 @@ ProcessFile(JSContext* cx, const char* filename, FILE* file, bool forceTTY)
}
}
}
JS_EndRequest(cx);
} while (!hitEOF && !gQuitting);
fprintf(gOutFile, "\n");
}
static void
Process(JSContext* cx, const char* filename, bool forceTTY)
Process(AutoJSAPI& jsapi, const char* filename, bool forceTTY)
{
FILE* file;
@ -939,7 +938,7 @@ Process(JSContext* cx, const char* filename, bool forceTTY)
} else {
file = fopen(filename, "r");
if (!file) {
JS_ReportErrorNumber(cx, my_GetErrorMessage, nullptr,
JS_ReportErrorNumber(jsapi.cx(), my_GetErrorMessage, nullptr,
JSSMSG_CANT_OPEN,
filename, strerror(errno));
gExitCode = EXITCODE_FILE_NOT_FOUND;
@ -947,7 +946,7 @@ Process(JSContext* cx, const char* filename, bool forceTTY)
}
}
ProcessFile(cx, filename, file, forceTTY);
ProcessFile(jsapi, filename, file, forceTTY);
if (file != stdin)
fclose(file);
}
@ -988,8 +987,9 @@ ProcessArgsForCompartment(JSContext* cx, char** argv, int argc)
}
static int
ProcessArgs(JSContext* cx, char** argv, int argc, XPCShellDirProvider* aDirProvider)
ProcessArgs(AutoJSAPI& jsapi, char** argv, int argc, XPCShellDirProvider* aDirProvider)
{
JSContext* cx = jsapi.cx();
const char rcfilename[] = "xpcshell.js";
FILE* rcfile;
int rootPosition;
@ -1001,7 +1001,7 @@ ProcessArgs(JSContext* cx, char** argv, int argc, XPCShellDirProvider* aDirProvi
rcfile = fopen(rcfilename, "r");
if (rcfile) {
printf("[loading '%s'...]\n", rcfilename);
ProcessFile(cx, rcfilename, rcfile, false);
ProcessFile(jsapi, rcfilename, rcfile, false);
fclose(rcfile);
}
@ -1080,7 +1080,7 @@ ProcessArgs(JSContext* cx, char** argv, int argc, XPCShellDirProvider* aDirProvi
if (++i == argc) {
return usage();
}
Process(cx, argv[i], false);
Process(jsapi, argv[i], false);
/*
* XXX: js -f foo.js should interpret foo.js and then
* drop into interactive mode, but that breaks test
@ -1133,7 +1133,7 @@ ProcessArgs(JSContext* cx, char** argv, int argc, XPCShellDirProvider* aDirProvi
}
if (filename || isInteractive)
Process(cx, filename, forceTTY);
Process(jsapi, filename, forceTTY);
return gExitCode;
}
@ -1435,7 +1435,7 @@ XRE_XPCShellMain(int argc, char** argv, char** envp)
JS_SetErrorReporter(rt, XPCShellErrorReporter);
dom::AutoJSAPI jsapi;
AutoJSAPI jsapi;
jsapi.Init();
cx = jsapi.cx();
@ -1548,9 +1548,8 @@ XRE_XPCShellMain(int argc, char** argv, char** envp)
// We are almost certainly going to run script here, so we need an
// AutoEntryScript. This is Gecko-specific and not in any spec.
dom::AutoEntryScript aes(backstagePass,
"xpcshell argument processing");
result = ProcessArgs(aes.cx(), argv, argc, &dirprovider);
AutoEntryScript aes(backstagePass, "xpcshell argument processing");
result = ProcessArgs(aes, argv, argc, &dirprovider);
JS_DropPrincipals(rt, gJSPrincipals);
JS_SetAllNonReservedSlotsToUndefined(aes.cx(), glob);