Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1255192 part 2. Clean up the JSContext usage around xpc::FindExceptionStackForConsoleReport now that it just needs a JSContext for rooting. r=bholley

Browse Source
This commit is contained in:
Boris Zbarsky 2016-03-09 22:27:14 -05:00
parent 891b63eeba
commit 692754b232
3 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/ScriptSettings.cpp
View File

@ -530,7 +530,7 @@ AutoJSAPI::ReportException()
DispatchScriptErrorEvent(inner, JS_GetRuntime(cx()), xpcReport, exn);
} else {
JS::Rooted<JSObject*> stack(cx(),
xpc::FindExceptionStackForConsoleReport(cx(), inner, exn));
xpc::FindExceptionStackForConsoleReport(inner, exn));
xpcReport->LogToConsoleWithStack(stack);
}
} else {

42
dom/base/nsJSEnvironment.cpp
View File

@ -227,12 +227,13 @@ ProcessNameForCollectorLog()
namespace xpc {
// This handles JS Exceptions (via ExceptionStackOrNull), as well as DOM and XPC Exceptions.
// This handles JS Exceptions (via ExceptionStackOrNull), as well as DOM and XPC
// Exceptions.
//
// Note that the returned object is _not_ wrapped into the compartment of cx.
// Note that the returned object is _not_ wrapped into the compartment of
// exceptionValue.
JSObject*
FindExceptionStackForConsoleReport(JSContext* cx,
nsPIDOMWindowInner* win,
FindExceptionStackForConsoleReport(nsPIDOMWindowInner* win,
JS::HandleValue exceptionValue)
{
if (!exceptionValue.isObject()) {
@ -245,9 +246,9 @@ FindExceptionStackForConsoleReport(JSContext* cx,
return nullptr;
}
JSContext* cx = nsContentUtils::RootingCxForThread();
JS::RootedObject exceptionObject(cx, &exceptionValue.toObject());
JSAutoCompartment ac(cx, exceptionObject);
JS::RootedObject stackObject(cx, ExceptionStackOrNull(exceptionObject));
JSObject* stackObject = ExceptionStackOrNull(exceptionObject);
if (stackObject) {
return stackObject;
}
@ -270,9 +271,9 @@ FindExceptionStackForConsoleReport(JSContext* cx,
JS::RootedValue value(cx);
stack->GetNativeSavedFrame(&value);
if (value.isObject()) {
stackObject = &value.toObject();
return &value.toObject();
}
return stackObject;
return nullptr;
}
} /* namespace xpc */
@ -435,8 +436,10 @@ public:
nsEventStatus status = nsEventStatus_eIgnore;
nsPIDOMWindowInner* win = mWindow;
MOZ_ASSERT(win);
MOZ_ASSERT(NS_IsMainThread());
// First, notify the DOM that we have a script error, but only if
// our window is still the current inner.
JSContext* rootingCx = nsContentUtils::RootingCx();
if (win->IsCurrentInnerWindow() && win->GetDocShell() && !sHandlingScriptError) {
AutoRestore<bool> recursionGuard(sHandlingScriptError);
sHandlingScriptError = true;
@ -444,8 +447,7 @@ public:
RefPtr<nsPresContext> presContext;
win->GetDocShell()->GetPresContext(getter_AddRefs(presContext));
ThreadsafeAutoJSContext cx;
RootedDictionary<ErrorEventInit> init(cx);
RootedDictionary<ErrorEventInit> init(rootingCx);
init.mCancelable = true;
init.mFilename = mReport->mFileName;
init.mBubbles = true;
@ -472,21 +474,9 @@ public:
}
if (status != nsEventStatus_eConsumeNoDefault) {
if (mError.isObject()) {
AutoJSAPI jsapi;
if (NS_WARN_IF(!jsapi.Init(mError.toObjectOrNull()))) {
mReport->LogToConsole();
return NS_OK;
}
JSContext* cx = jsapi.cx();
JS::Rooted<JS::Value> exn(cx, mError);
JS::RootedObject stack(cx,
xpc::FindExceptionStackForConsoleReport(cx, win, exn));
mReport->LogToConsoleWithStack(stack);
} else {
mReport->LogToConsole();
}
JS::Rooted<JSObject*> stack(rootingCx,
xpc::FindExceptionStackForConsoleReport(win, mError));
mReport->LogToConsoleWithStack(stack);
}
return NS_OK;
@ -565,7 +555,7 @@ SystemErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
report->errorNumber == JSMSG_OUT_OF_MEMORY)
{
JS::Rooted<JSObject*> stack(cx,
xpc::FindExceptionStackForConsoleReport(cx, win, exception));
xpc::FindExceptionStackForConsoleReport(win, exception));
xpcReport->LogToConsoleWithStack(stack);
return;
}

8
js/xpconnect/src/xpcpublic.h
View File

@ -547,9 +547,8 @@ DispatchScriptErrorEvent(nsPIDOMWindowInner* win, JSRuntime* rt, xpc::ErrorRepor
// Get a stack of the sort that can be passed to
// xpc::ErrorReport::LogToConsoleWithStack from the given exception value. Can
// return null if the exception value doesn't have an associated stack. The
// passed-in value does NOT necessarily have to be in the same compartment as
// the passed-in JSContext. The returned stack, if any, may also not be in the
// same compartment as either cx or exceptionValue.
// returned stack, if any, may also not be in the same compartment as
// exceptionValue.
//
// The "win" argument passed in here should be the same as the window whose
// WindowID() is used to initialize the xpc::ErrorReport. This may be null, of
@ -557,8 +556,7 @@ DispatchScriptErrorEvent(nsPIDOMWindowInner* win, JSRuntime* rt, xpc::ErrorRepor
// the window is far enough gone, because in those cases we don't want to have
// the stack in the console message keeping the window alive.
JSObject*
FindExceptionStackForConsoleReport(JSContext* cx,
nsPIDOMWindowInner* win,
FindExceptionStackForConsoleReport(nsPIDOMWindowInner* win,
JS::HandleValue exceptionValue);
// Return a name for the compartment.