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 966452 part 2. Report all unhandled Promise rejections. r=nsm,bholley

Browse Source
This commit is contained in:
Boris Zbarsky 2014-07-04 01:24:59 -04:00
parent acdb9ffad6
commit 490c91845a
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dom/promise/Promise.cpp
View File

@ -24,6 +24,9 @@
#include "nsJSUtils.h"
#include "nsPIDOMWindow.h"
#include "nsJSEnvironment.h"
#include "nsIScriptObjectPrincipal.h"
#include "xpcpublic.h"
#include "nsGlobalWindow.h"
namespace mozilla {
namespace dom {
@ -1060,14 +1063,25 @@ Promise::MaybeReportRejected()
return;
}
if (!mResult.isObject()) {
AutoJSAPI jsapi;
// We may not have a usable global by now (if it got unlinked
// already), so don't init with it.
jsapi.Init();
JSContext* cx = jsapi.cx();
JS::Rooted<JSObject*> obj(cx, GetWrapper());
MOZ_ASSERT(obj); // We preserve our wrapper, so should always have one here.
JS::Rooted<JS::Value> val(cx, mResult);
JS::ExposeValueToActiveJS(val);
JSAutoCompartment ac(cx, obj);
if (!JS_WrapValue(cx, &val)) {
JS_ClearPendingException(cx);
return;
}
ThreadsafeAutoJSContext cx;
JS::Rooted<JSObject*> obj(cx, &mResult.toObject());
JSAutoCompartment ac(cx, obj);
JSErrorReport* report = JS_ErrorFromException(cx, obj);
if (!report) {
js::ErrorReport report(cx);
if (!report.init(cx, val)) {
JS_ClearPendingException(cx);
return;
}
@ -1076,9 +1090,9 @@ Promise::MaybeReportRejected()
bool isChromeError = false;
if (MOZ_LIKELY(NS_IsMainThread())) {
win =
do_QueryInterface(nsJSUtils::GetStaticScriptGlobal(obj));
nsIPrincipal* principal = nsContentUtils::ObjectPrincipal(obj);
nsIPrincipal* principal;
win = xpc::WindowGlobalOrNull(obj);
principal = nsContentUtils::ObjectPrincipal(obj);
isChromeError = nsContentUtils::IsSystemPrincipal(principal);
} else {
WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
@ -1091,9 +1105,9 @@ Promise::MaybeReportRejected()
// AsyncErrorReporter, otherwise if the call to DispatchToMainThread fails, it
// will leak. See Bug 958684.
nsRefPtr<AsyncErrorReporter> r =
new AsyncErrorReporter(JS_GetObjectRuntime(obj),
report,
nullptr,
new AsyncErrorReporter(CycleCollectedJSRuntime::Get()->Runtime(),
report.report(),
report.message(),
isChromeError,
win);
NS_DispatchToMainThread(r);