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 1062077 - Switch SystemErrorReporter to xpc::ErrorReport. r=bz

Browse Source
This commit is contained in:
Bobby Holley 2014-09-08 16:30:11 -07:00
parent 25ec5c8219
commit b3f9fb2045
1 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
js/xpconnect/src/nsXPConnect.cpp
View File

@ -197,44 +197,12 @@ xpc::SystemErrorReporter(JSContext *cx, const char *message, JSErrorReport *rep)
// exception is ending here, it's not going to get propagated to a caller,
// so it's up to us to make it known.
nsresult rv;
/* Use the console service to register the error. */
nsCOMPtr<nsIConsoleService> consoleService =
do_GetService(NS_CONSOLESERVICE_CONTRACTID);
/*
* Make an nsIScriptError, populate it with information from this
* error, then log it with the console service.
*/
nsCOMPtr<nsIScriptError> errorObject =
do_CreateInstance(NS_SCRIPTERROR_CONTRACTID);
if (consoleService && errorObject) {
uint32_t column = rep->uctokenptr - rep->uclinebuf;
const char16_t* ucmessage =
static_cast<const char16_t*>(rep->ucmessage);
const char16_t* uclinebuf =
static_cast<const char16_t*>(rep->uclinebuf);
rv = errorObject->Init(
ucmessage ? nsDependentString(ucmessage) : EmptyString(),
NS_ConvertASCIItoUTF16(rep->filename),
uclinebuf ? nsDependentString(uclinebuf) : EmptyString(),
rep->lineno, column, rep->flags,
"system javascript");
if (NS_SUCCEEDED(rv))
consoleService->LogMessage(errorObject);
}
if (nsContentUtils::DOMWindowDumpEnabled()) {
fprintf(stderr, "System JS : %s %s:%d - %s\n",
JSREPORT_IS_WARNING(rep->flags) ? "WARNING" : "ERROR",
rep->filename, rep->lineno,
message ? message : "<no message>");
}
nsRefPtr<ErrorReport> report = new ErrorReport();
// Note that the only effect of the global we pass here is to distinguish
// between "chrome javascript" and "content javascript", so we can just
// hackily pass the privileged junk scope for the time being.
report->Init(rep, message, GetNativeForGlobal(xpc::PrivilegedJunkScope()));
report->LogToConsole();
}
void