Backed out changeset 0c08e9e0f505 (
bug 899574) Build Bustage on CLOSED TREE
--- a/dom/promise/Promise.cpp
+++ b/dom/promise/Promise.cpp
@@ -184,30 +184,16 @@ Promise::EnabledForScope(JSContext* aCx,
return workers::GetWorkerPrivateFromContext(aCx)->IsChromeWorker();
}
nsIPrincipal* prin = nsContentUtils::GetSubjectPrincipal();
return nsContentUtils::IsSystemPrincipal(prin) ||
prin->GetAppStatus() == nsIPrincipal::APP_STATUS_CERTIFIED;
}
-void
-Promise::MaybeResolve(JSContext* aCx,
- const Optional<JS::Handle<JS::Value> >& aValue)
-{
- MaybeResolveInternal(aCx, aValue);
-}
-
-void
-Promise::MaybeReject(JSContext* aCx,
- const Optional<JS::Handle<JS::Value> >& aValue)
-{
- MaybeRejectInternal(aCx, aValue);
-}
-
static void
EnterCompartment(Maybe<JSAutoCompartment>& aAc, JSContext* aCx,
const Optional<JS::Handle<JS::Value> >& aValue)
{
// FIXME Bug 878849
if (aValue.WasPassed() && aValue.Value().isObject()) {
JS::Rooted<JSObject*> rooted(aCx, &aValue.Value().toObject());
aAc.construct(aCx, rooted);
@@ -238,19 +224,19 @@ Promise::JSCallback(JSContext *aCx, unsi
if (aArgc) {
value.Value() = args[0];
}
v = js::GetFunctionNativeReserved(&args.callee(), SLOT_TASK);
PromiseCallback::Task task = static_cast<PromiseCallback::Task>(v.toInt32());
if (task == PromiseCallback::Resolve) {
- promise->MaybeResolveInternal(aCx, value);
+ promise->MaybeResolve(aCx, value);
} else {
- promise->MaybeRejectInternal(aCx, value);
+ promise->MaybeReject(aCx, value);
}
return true;
}
/* static */ JSObject*
Promise::CreateFunction(JSContext* aCx, JSObject* aParent, Promise* aPromise,
int32_t aTask)
@@ -309,17 +295,17 @@ Promise::Constructor(const GlobalObject&
aRv.WouldReportJSException();
if (aRv.IsJSException()) {
Optional<JS::Handle<JS::Value> > value(cx);
aRv.StealJSException(cx, &value.Value());
Maybe<JSAutoCompartment> ac;
EnterCompartment(ac, cx, value);
- promise->MaybeRejectInternal(cx, value);
+ promise->MaybeReject(cx, value);
}
return promise.forget();
}
/* static */ already_AddRefed<Promise>
Promise::Resolve(const GlobalObject& aGlobal, JSContext* aCx,
JS::Handle<JS::Value> aValue, ErrorResult& aRv)
@@ -328,34 +314,34 @@ Promise::Resolve(const GlobalObject& aGl
if (!window) {
aRv.Throw(NS_ERROR_UNEXPECTED);
return nullptr;
}
nsRefPtr<Promise> promise = new Promise(window);
Optional<JS::Handle<JS::Value> > value(aCx, aValue);
- promise->MaybeResolveInternal(aCx, value);
+ promise->MaybeResolve(aCx, value);
return promise.forget();
}
/* static */ already_AddRefed<Promise>
Promise::Reject(const GlobalObject& aGlobal, JSContext* aCx,
JS::Handle<JS::Value> aValue, ErrorResult& aRv)
{
nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobal.GetAsSupports());
if (!window) {
aRv.Throw(NS_ERROR_UNEXPECTED);
return nullptr;
}
nsRefPtr<Promise> promise = new Promise(window);
Optional<JS::Handle<JS::Value> > value(aCx, aValue);
- promise->MaybeRejectInternal(aCx, value);
+ promise->MaybeReject(aCx, value);
return promise.forget();
}
already_AddRefed<Promise>
Promise::Then(const Optional<OwningNonNull<AnyCallback> >& aResolveCallback,
const Optional<OwningNonNull<AnyCallback> >& aRejectCallback)
{
nsRefPtr<Promise> promise = new Promise(GetParentObject());
@@ -450,31 +436,31 @@ Promise::MaybeReportRejected()
new AsyncErrorReporter(JS_GetObjectRuntime(&mResult.toObject()),
report,
nullptr,
nsContentUtils::GetObjectPrincipal(&mResult.toObject()),
win));
}
void
-Promise::MaybeResolveInternal(JSContext* aCx,
- const Optional<JS::Handle<JS::Value> >& aValue,
- PromiseTaskSync aAsynchronous)
+Promise::MaybeResolve(JSContext* aCx,
+ const Optional<JS::Handle<JS::Value> >& aValue,
+ PromiseTaskSync aAsynchronous)
{
if (mResolvePending) {
return;
}
ResolveInternal(aCx, aValue, aAsynchronous);
}
void
-Promise::MaybeRejectInternal(JSContext* aCx,
- const Optional<JS::Handle<JS::Value> >& aValue,
- PromiseTaskSync aAsynchronous)
+Promise::MaybeReject(JSContext* aCx,
+ const Optional<JS::Handle<JS::Value> >& aValue,
+ PromiseTaskSync aAsynchronous)
{
if (mResolvePending) {
return;
}
RejectInternal(aCx, aValue, aAsynchronous);
}
--- a/dom/promise/Promise.h
+++ b/dom/promise/Promise.h
@@ -38,21 +38,16 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Promise)
Promise(nsPIDOMWindow* aWindow);
~Promise();
static bool PrefEnabled();
static bool EnabledForScope(JSContext* aCx, JSObject* /* unused */);
- void MaybeResolve(JSContext* aCx,
- const Optional<JS::Handle<JS::Value> >& aValue);
- void MaybeReject(JSContext* aCx,
- const Optional<JS::Handle<JS::Value> >& aValue);
-
// WebIDL
nsPIDOMWindow* GetParentObject() const
{
return mWindow;
}
virtual JSObject*
@@ -114,22 +109,22 @@ private:
void AppendCallbacks(PromiseCallback* aResolveCallback,
PromiseCallback* aRejectCallback);
// If we have been rejected and our mResult is a JS exception,
// report it to the error console.
void MaybeReportRejected();
- void MaybeResolveInternal(JSContext* aCx,
- const Optional<JS::Handle<JS::Value> >& aValue,
- PromiseTaskSync aSync = AsyncTask);
- void MaybeRejectInternal(JSContext* aCx,
- const Optional<JS::Handle<JS::Value> >& aValue,
- PromiseTaskSync aSync = AsyncTask);
+ void MaybeResolve(JSContext* aCx,
+ const Optional<JS::Handle<JS::Value> >& aValue,
+ PromiseTaskSync aSync = AsyncTask);
+ void MaybeReject(JSContext* aCx,
+ const Optional<JS::Handle<JS::Value> >& aValue,
+ PromiseTaskSync aSync = AsyncTask);
void ResolveInternal(JSContext* aCx,
const Optional<JS::Handle<JS::Value> >& aValue,
PromiseTaskSync aSync = AsyncTask);
void RejectInternal(JSContext* aCx,
const Optional<JS::Handle<JS::Value> >& aValue,
PromiseTaskSync aSync = AsyncTask);