зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset b2995c617e4c (bug 915233) for breaking the build on a CLOSED TREE
This commit is contained in:
Wes Kocher
Родитель
280f31f856
Коммит
a7e71d74e5
|
|
@ -10,7 +10,6 @@
|
|||
#include "mozilla/dom/OwningNonNull.h"
|
||||
#include "mozilla/dom/PromiseBinding.h"
|
||||
#include "mozilla/Preferences.h"
|
||||
#include "mozilla/SyncRunnable.h"
|
||||
#include "PromiseCallback.h"
|
||||
#include "nsContentUtils.h"
|
||||
#include "nsPIDOMWindow.h"
|
||||
|
|
@ -23,8 +22,6 @@
|
|||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
using namespace workers;
|
||||
|
||||
// PromiseTask
|
||||
|
||||
// This class processes the promise's callbacks with promise's result.
|
||||
|
|
@ -54,65 +51,36 @@ private:
|
|||
nsRefPtr<Promise> mPromise;
|
||||
};
|
||||
|
||||
class WorkerPromiseTask MOZ_FINAL : public WorkerRunnable
|
||||
// This class processes the promise's callbacks with promise's result.
|
||||
class PromiseResolverTask MOZ_FINAL : public nsRunnable
|
||||
{
|
||||
public:
|
||||
WorkerPromiseTask(WorkerPrivate* aWorkerPrivate, Promise* aPromise)
|
||||
: WorkerRunnable(aWorkerPrivate, WorkerThread,
|
||||
UnchangedBusyCount, SkipWhenClearing)
|
||||
, mPromise(aPromise)
|
||||
{
|
||||
MOZ_ASSERT(aPromise);
|
||||
MOZ_COUNT_CTOR(WorkerPromiseTask);
|
||||
}
|
||||
|
||||
~WorkerPromiseTask()
|
||||
{
|
||||
MOZ_COUNT_DTOR(WorkerPromiseTask);
|
||||
}
|
||||
|
||||
bool
|
||||
WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
|
||||
{
|
||||
mPromise->mTaskPending = false;
|
||||
mPromise->RunTask();
|
||||
return true;
|
||||
}
|
||||
|
||||
private:
|
||||
nsRefPtr<Promise> mPromise;
|
||||
};
|
||||
|
||||
class PromiseResolverMixin
|
||||
{
|
||||
public:
|
||||
PromiseResolverMixin(Promise* aPromise,
|
||||
JS::Handle<JS::Value> aValue,
|
||||
Promise::PromiseState aState)
|
||||
PromiseResolverTask(Promise* aPromise,
|
||||
JS::Handle<JS::Value> aValue,
|
||||
Promise::PromiseState aState)
|
||||
: mPromise(aPromise)
|
||||
, mValue(aValue)
|
||||
, mState(aState)
|
||||
{
|
||||
MOZ_ASSERT(aPromise);
|
||||
MOZ_ASSERT(mState != Promise::Pending);
|
||||
MOZ_COUNT_CTOR(PromiseResolverMixin);
|
||||
MOZ_COUNT_CTOR(PromiseResolverTask);
|
||||
|
||||
JSContext* cx = nsContentUtils::GetDefaultJSContextForThread();
|
||||
JSContext* cx = nsContentUtils::GetSafeJSContext();
|
||||
|
||||
/* It's safe to use unsafeGet() here: the unsafeness comes from the
|
||||
* possibility of updating the value of mJSObject without triggering the
|
||||
* barriers. However if the value will always be marked, post barriers
|
||||
* unnecessary. */
|
||||
JS_AddNamedValueRootRT(JS_GetRuntime(cx), mValue.unsafeGet(),
|
||||
"PromiseResolverMixin.mValue");
|
||||
"PromiseResolverTask.mValue");
|
||||
}
|
||||
|
||||
virtual ~PromiseResolverMixin()
|
||||
~PromiseResolverTask()
|
||||
{
|
||||
NS_ASSERT_OWNINGTHREAD(PromiseResolverMixin);
|
||||
MOZ_COUNT_DTOR(PromiseResolverMixin);
|
||||
MOZ_COUNT_DTOR(PromiseResolverTask);
|
||||
|
||||
JSContext* cx = nsContentUtils::GetDefaultJSContextForThread();
|
||||
JSContext* cx = nsContentUtils::GetSafeJSContext();
|
||||
|
||||
/* It's safe to use unsafeGet() here: the unsafeness comes from the
|
||||
* possibility of updating the value of mJSObject without triggering the
|
||||
|
|
@ -121,66 +89,18 @@ public:
|
|||
JS_RemoveValueRootRT(JS_GetRuntime(cx), mValue.unsafeGet());
|
||||
}
|
||||
|
||||
protected:
|
||||
void
|
||||
RunInternal()
|
||||
NS_IMETHOD Run()
|
||||
{
|
||||
NS_ASSERT_OWNINGTHREAD(PromiseResolverMixin);
|
||||
mPromise->RunResolveTask(
|
||||
JS::Handle<JS::Value>::fromMarkedLocation(mValue.address()),
|
||||
mState, Promise::SyncTask);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
private:
|
||||
nsRefPtr<Promise> mPromise;
|
||||
JS::Heap<JS::Value> mValue;
|
||||
Promise::PromiseState mState;
|
||||
NS_DECL_OWNINGTHREAD;
|
||||
};
|
||||
|
||||
// This class processes the promise's callbacks with promise's result.
|
||||
class PromiseResolverTask MOZ_FINAL : public nsRunnable,
|
||||
public PromiseResolverMixin
|
||||
{
|
||||
public:
|
||||
PromiseResolverTask(Promise* aPromise,
|
||||
JS::Handle<JS::Value> aValue,
|
||||
Promise::PromiseState aState)
|
||||
: PromiseResolverMixin(aPromise, aValue, aState)
|
||||
{}
|
||||
|
||||
~PromiseResolverTask()
|
||||
{}
|
||||
|
||||
NS_IMETHOD Run()
|
||||
{
|
||||
RunInternal();
|
||||
return NS_OK;
|
||||
}
|
||||
};
|
||||
|
||||
class WorkerPromiseResolverTask MOZ_FINAL : public WorkerRunnable,
|
||||
public PromiseResolverMixin
|
||||
{
|
||||
public:
|
||||
WorkerPromiseResolverTask(WorkerPrivate* aWorkerPrivate,
|
||||
Promise* aPromise,
|
||||
JS::Handle<JS::Value> aValue,
|
||||
Promise::PromiseState aState)
|
||||
: WorkerRunnable(aWorkerPrivate, WorkerThread,
|
||||
UnchangedBusyCount, SkipWhenClearing),
|
||||
PromiseResolverMixin(aPromise, aValue, aState)
|
||||
{}
|
||||
|
||||
~WorkerPromiseResolverTask()
|
||||
{}
|
||||
|
||||
bool
|
||||
WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
|
||||
{
|
||||
RunInternal();
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
// Promise
|
||||
|
|
@ -243,55 +163,25 @@ Promise::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
|||
return PromiseBinding::Wrap(aCx, aScope, this);
|
||||
}
|
||||
|
||||
class PrefEnabledRunnable : public nsRunnable
|
||||
/* static */ bool
|
||||
Promise::PrefEnabled()
|
||||
{
|
||||
public:
|
||||
PrefEnabledRunnable() : mEnabled(false) {}
|
||||
|
||||
bool
|
||||
Enabled()
|
||||
{
|
||||
return mEnabled;
|
||||
}
|
||||
|
||||
nsresult
|
||||
Run()
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
mEnabled = Preferences::GetBool("dom.promise.enabled", false);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
private:
|
||||
bool mEnabled;
|
||||
};
|
||||
return Preferences::GetBool("dom.promise.enabled", false);
|
||||
}
|
||||
|
||||
/* static */ bool
|
||||
Promise::EnabledForScope(JSContext* aCx, JSObject* /* unused */)
|
||||
{
|
||||
// Enable if the pref is enabled or if we're chrome or if we're a
|
||||
// certified app.
|
||||
nsCOMPtr<nsIThread> mainThread;
|
||||
nsresult rv = NS_GetMainThread(getter_AddRefs(mainThread));
|
||||
MOZ_ASSERT(NS_SUCCEEDED(rv));
|
||||
|
||||
nsRefPtr<PrefEnabledRunnable> r = new PrefEnabledRunnable();
|
||||
|
||||
// When used from the main thread, SyncRunnable will internally directly call
|
||||
// the function rather than dispatch a Runnable. So this is usable on any
|
||||
// thread.
|
||||
// Although this pause is expensive, it is performed only once per worker when
|
||||
// the worker in initialized.
|
||||
SyncRunnable::DispatchToThread(mainThread, r);
|
||||
if (r->Enabled()) {
|
||||
if (PrefEnabled()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// FIXME(nsm): Remove these checks once promises are enabled by default.
|
||||
// Note that we have no concept of a certified app in workers.
|
||||
// XXXbz well, why not?
|
||||
if (!NS_IsMainThread()) {
|
||||
return GetWorkerPrivateFromContext(aCx)->IsChromeWorker();
|
||||
return workers::GetWorkerPrivateFromContext(aCx)->IsChromeWorker();
|
||||
}
|
||||
|
||||
nsIPrincipal* prin = nsContentUtils::GetSubjectPrincipal();
|
||||
|
|
@ -390,15 +280,10 @@ Promise::Constructor(const GlobalObject& aGlobal,
|
|||
PromiseInit& aInit, ErrorResult& aRv)
|
||||
{
|
||||
JSContext* cx = aGlobal.GetContext();
|
||||
nsCOMPtr<nsPIDOMWindow> window;
|
||||
|
||||
// On workers, let the window be null.
|
||||
if (MOZ_LIKELY(NS_IsMainThread())) {
|
||||
window = do_QueryInterface(aGlobal.GetAsSupports());
|
||||
if (!window) {
|
||||
aRv.Throw(NS_ERROR_UNEXPECTED);
|
||||
return nullptr;
|
||||
}
|
||||
nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobal.GetAsSupports());
|
||||
if (!window) {
|
||||
aRv.Throw(NS_ERROR_UNEXPECTED);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsRefPtr<Promise> promise = new Promise(window);
|
||||
|
|
@ -439,13 +324,10 @@ Promise::Constructor(const GlobalObject& aGlobal,
|
|||
Promise::Resolve(const GlobalObject& aGlobal, JSContext* aCx,
|
||||
JS::Handle<JS::Value> aValue, ErrorResult& aRv)
|
||||
{
|
||||
nsCOMPtr<nsPIDOMWindow> window;
|
||||
if (MOZ_LIKELY(NS_IsMainThread())) {
|
||||
window = do_QueryInterface(aGlobal.GetAsSupports());
|
||||
if (!window) {
|
||||
aRv.Throw(NS_ERROR_UNEXPECTED);
|
||||
return nullptr;
|
||||
}
|
||||
nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobal.GetAsSupports());
|
||||
if (!window) {
|
||||
aRv.Throw(NS_ERROR_UNEXPECTED);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsRefPtr<Promise> promise = new Promise(window);
|
||||
|
|
@ -459,13 +341,10 @@ Promise::Resolve(const GlobalObject& aGlobal, JSContext* aCx,
|
|||
Promise::Reject(const GlobalObject& aGlobal, JSContext* aCx,
|
||||
JS::Handle<JS::Value> aValue, ErrorResult& aRv)
|
||||
{
|
||||
nsCOMPtr<nsPIDOMWindow> window;
|
||||
if (MOZ_LIKELY(NS_IsMainThread())) {
|
||||
window = do_QueryInterface(aGlobal.GetAsSupports());
|
||||
if (!window) {
|
||||
aRv.Throw(NS_ERROR_UNEXPECTED);
|
||||
return nullptr;
|
||||
}
|
||||
nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobal.GetAsSupports());
|
||||
if (!window) {
|
||||
aRv.Throw(NS_ERROR_UNEXPECTED);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsRefPtr<Promise> promise = new Promise(window);
|
||||
|
|
@ -524,15 +403,8 @@ Promise::AppendCallbacks(PromiseCallback* aResolveCallback,
|
|||
// callbacks with promise's result. If promise's state is rejected, queue a
|
||||
// task to process our reject callbacks with promise's result.
|
||||
if (mState != Pending && !mTaskPending) {
|
||||
if (MOZ_LIKELY(NS_IsMainThread())) {
|
||||
nsRefPtr<PromiseTask> task = new PromiseTask(this);
|
||||
NS_DispatchToCurrentThread(task);
|
||||
} else {
|
||||
WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
|
||||
MOZ_ASSERT(worker);
|
||||
nsRefPtr<WorkerPromiseTask> task = new WorkerPromiseTask(worker, this);
|
||||
worker->Dispatch(task);
|
||||
}
|
||||
nsRefPtr<PromiseTask> task = new PromiseTask(this);
|
||||
NS_DispatchToCurrentThread(task);
|
||||
mTaskPending = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -548,9 +420,8 @@ Promise::RunTask()
|
|||
mResolveCallbacks.Clear();
|
||||
mRejectCallbacks.Clear();
|
||||
|
||||
JSContext* cx = nsContentUtils::GetDefaultJSContextForThread();
|
||||
JSAutoRequest ar(cx);
|
||||
Optional<JS::Handle<JS::Value> > value(cx, mResult);
|
||||
JSAutoRequest ar(nsContentUtils::GetSafeJSContext());
|
||||
Optional<JS::Handle<JS::Value> > value(nsContentUtils::GetSafeJSContext(), mResult);
|
||||
|
||||
for (uint32_t i = 0; i < callbacks.Length(); ++i) {
|
||||
callbacks[i]->Call(value);
|
||||
|
|
@ -571,27 +442,16 @@ Promise::MaybeReportRejected()
|
|||
|
||||
MOZ_ASSERT(mResult.isObject(), "How did we get a JSErrorReport?");
|
||||
|
||||
// Remains null in case of worker.
|
||||
nsCOMPtr<nsPIDOMWindow> win;
|
||||
bool isChromeError = false;
|
||||
|
||||
if (MOZ_LIKELY(NS_IsMainThread())) {
|
||||
win =
|
||||
do_QueryInterface(nsJSUtils::GetStaticScriptGlobal(&mResult.toObject()));
|
||||
nsIPrincipal* principal = nsContentUtils::GetObjectPrincipal(&mResult.toObject());
|
||||
isChromeError = nsContentUtils::IsSystemPrincipal(principal);
|
||||
} else {
|
||||
WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
|
||||
MOZ_ASSERT(worker);
|
||||
isChromeError = worker->IsChromeWorker();
|
||||
}
|
||||
nsCOMPtr<nsPIDOMWindow> win =
|
||||
do_QueryInterface(nsJSUtils::GetStaticScriptGlobal(&mResult.toObject()));
|
||||
|
||||
nsIPrincipal* principal = nsContentUtils::GetObjectPrincipal(&mResult.toObject());
|
||||
// Now post an event to do the real reporting async
|
||||
NS_DispatchToMainThread(
|
||||
NS_DispatchToCurrentThread(
|
||||
new AsyncErrorReporter(JS_GetObjectRuntime(&mResult.toObject()),
|
||||
report,
|
||||
nullptr,
|
||||
isChromeError,
|
||||
nsContentUtils::IsSystemPrincipal(principal),
|
||||
win));
|
||||
}
|
||||
|
||||
|
|
@ -670,17 +530,9 @@ Promise::RunResolveTask(JS::Handle<JS::Value> aValue,
|
|||
// If the synchronous flag is unset, queue a task to process our
|
||||
// accept callbacks with value.
|
||||
if (aAsynchronous == AsyncTask) {
|
||||
if (MOZ_LIKELY(NS_IsMainThread())) {
|
||||
nsRefPtr<PromiseResolverTask> task =
|
||||
new PromiseResolverTask(this, aValue, aState);
|
||||
NS_DispatchToCurrentThread(task);
|
||||
} else {
|
||||
WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
|
||||
MOZ_ASSERT(worker);
|
||||
nsRefPtr<WorkerPromiseResolverTask> task =
|
||||
new WorkerPromiseResolverTask(worker, this, aValue, aState);
|
||||
worker->Dispatch(task);
|
||||
}
|
||||
nsRefPtr<PromiseResolverTask> task =
|
||||
new PromiseResolverTask(this, aValue, aState);
|
||||
NS_DispatchToCurrentThread(task);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,13 +27,10 @@ class AnyCallback;
|
|||
class Promise MOZ_FINAL : public nsISupports,
|
||||
public nsWrapperCache
|
||||
{
|
||||
friend class PromiseResolverMixin;
|
||||
friend class PromiseResolverTask;
|
||||
friend class PromiseTask;
|
||||
friend class RejectPromiseCallback;
|
||||
friend class PromiseResolverTask;
|
||||
friend class ResolvePromiseCallback;
|
||||
friend class WorkerPromiseResolverTask;
|
||||
friend class WorkerPromiseTask;
|
||||
friend class RejectPromiseCallback;
|
||||
friend class WrapperPromiseCallback;
|
||||
|
||||
public:
|
||||
|
|
@ -43,6 +40,7 @@ public:
|
|||
Promise(nsPIDOMWindow* aWindow);
|
||||
~Promise();
|
||||
|
||||
static bool PrefEnabled();
|
||||
static bool EnabledForScope(JSContext* aCx, JSObject* /* unused */);
|
||||
|
||||
void MaybeResolve(JSContext* aCx,
|
||||
|
|
|
|||
|
|
@ -74,13 +74,7 @@ void
|
|||
ResolvePromiseCallback::Call(const Optional<JS::Handle<JS::Value> >& aValue)
|
||||
{
|
||||
// Run resolver's algorithm with value and the synchronous flag set.
|
||||
JSContext *cx = nsContentUtils::GetDefaultJSContextForThread();
|
||||
|
||||
Maybe<AutoCxPusher> pusher;
|
||||
if (NS_IsMainThread()) {
|
||||
pusher.construct(cx);
|
||||
}
|
||||
|
||||
AutoJSContext cx;
|
||||
Maybe<JSAutoCompartment> ac;
|
||||
EnterCompartment(ac, cx, aValue);
|
||||
|
||||
|
|
@ -115,13 +109,7 @@ void
|
|||
RejectPromiseCallback::Call(const Optional<JS::Handle<JS::Value> >& aValue)
|
||||
{
|
||||
// Run resolver's algorithm with value and the synchronous flag set.
|
||||
JSContext *cx = nsContentUtils::GetDefaultJSContextForThread();
|
||||
|
||||
Maybe<AutoCxPusher> pusher;
|
||||
if (NS_IsMainThread()) {
|
||||
pusher.construct(cx);
|
||||
}
|
||||
|
||||
AutoJSContext cx;
|
||||
Maybe<JSAutoCompartment> ac;
|
||||
EnterCompartment(ac, cx, aValue);
|
||||
|
||||
|
|
@ -157,17 +145,7 @@ WrapperPromiseCallback::~WrapperPromiseCallback()
|
|||
void
|
||||
WrapperPromiseCallback::Call(const Optional<JS::Handle<JS::Value> >& aValue)
|
||||
{
|
||||
// AutoCxPusher and co. interact with xpconnect, which crashes on
|
||||
// workers. On workers we'll get the right context from
|
||||
// GetDefaultJSContextForThread(), and since there is only one context, we
|
||||
// don't need to push or pop it from the stack. Is that correct?
|
||||
JSContext* cx = nsContentUtils::GetDefaultJSContextForThread();
|
||||
|
||||
Maybe<AutoCxPusher> pusher;
|
||||
if (NS_IsMainThread()) {
|
||||
pusher.construct(cx);
|
||||
}
|
||||
|
||||
AutoJSContext cx;
|
||||
Maybe<JSAutoCompartment> ac;
|
||||
EnterCompartment(ac, cx, aValue);
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public:
|
|||
};
|
||||
|
||||
// WrapperPromiseCallback execs a JS Callback with a value, and then the return
|
||||
// value is sent to the aNextPromise->ResolveFunction() or to
|
||||
// value is sent to the aNextPromise->resolveFunction() or to
|
||||
// aNextPromise->RejectFunction() if the JS Callback throws.
|
||||
class WrapperPromiseCallback MOZ_FINAL : public PromiseCallback
|
||||
{
|
||||
|
|
|
|||
|
|
@ -368,15 +368,6 @@ function promiseResolveNestedPromise() {
|
|||
});
|
||||
}
|
||||
|
||||
function promiseRejectNoHandler() {
|
||||
// This test only checks that the code that reports unhandled errors in the
|
||||
// Promises implementation does not crash or leak.
|
||||
var promise = new Promise(function(res, rej) {
|
||||
noSuchMethod();
|
||||
});
|
||||
runTest();
|
||||
}
|
||||
|
||||
var tests = [ promiseResolve, promiseReject,
|
||||
promiseException, promiseGC, promiseAsync,
|
||||
promiseDoubleThen, promiseThenException,
|
||||
|
|
@ -389,7 +380,6 @@ var tests = [ promiseResolve, promiseReject,
|
|||
promiseWrongNestedPromise, promiseLoop,
|
||||
promiseStaticReject, promiseStaticResolve,
|
||||
promiseResolveNestedPromise,
|
||||
promiseRejectNoHandler,
|
||||
];
|
||||
|
||||
function runTest() {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
#include "mozilla/dom/ImageDataBinding.h"
|
||||
#include "mozilla/dom/MessageEventBinding.h"
|
||||
#include "mozilla/dom/MessagePortBinding.h"
|
||||
#include "mozilla/dom/PromiseBinding.h"
|
||||
#include "mozilla/dom/TextDecoderBinding.h"
|
||||
#include "mozilla/dom/TextEncoderBinding.h"
|
||||
#include "mozilla/dom/XMLHttpRequestBinding.h"
|
||||
|
|
@ -62,8 +61,6 @@ WorkerPrivate::RegisterBindings(JSContext* aCx, JS::Handle<JSObject*> aGlobal)
|
|||
!ImageDataBinding::GetConstructorObject(aCx, aGlobal) ||
|
||||
!MessageEventBinding::GetConstructorObject(aCx, aGlobal) ||
|
||||
!MessagePortBinding::GetConstructorObject(aCx, aGlobal) ||
|
||||
(PromiseBinding::ConstructorEnabled(aCx, aGlobal) &&
|
||||
!PromiseBinding::GetConstructorObject(aCx, aGlobal)) ||
|
||||
!TextDecoderBinding::GetConstructorObject(aCx, aGlobal) ||
|
||||
!TextEncoderBinding::GetConstructorObject(aCx, aGlobal) ||
|
||||
!XMLHttpRequestBinding_workers::GetConstructorObject(aCx, aGlobal) ||
|
||||
|
|
@ -80,4 +77,4 @@ WorkerPrivate::RegisterBindings(JSContext* aCx, JS::Handle<JSObject*> aGlobal)
|
|||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -27,7 +27,6 @@ support-files =
|
|||
multi_sharedWorker_sharedWorker.js
|
||||
navigator_worker.js
|
||||
newError_worker.js
|
||||
promise_worker.js
|
||||
recursion_worker.js
|
||||
recursiveOnerror_worker.js
|
||||
relativeLoad_import.js
|
||||
|
|
@ -84,7 +83,6 @@ support-files =
|
|||
[test_multi_sharedWorker_lifetimes.html]
|
||||
[test_navigator.html]
|
||||
[test_newError.html]
|
||||
[test_promise.html]
|
||||
[test_recursion.html]
|
||||
[test_recursiveOnerror.html]
|
||||
[test_relativeLoad.html]
|
||||
|
|
|
|||
|
|
@ -1,395 +0,0 @@
|
|||
function ok(a, msg) {
|
||||
dump("OK: " + !!a + " => " + a + " " + msg + "\n");
|
||||
postMessage({type: 'status', status: !!a, msg: a + ": " + msg });
|
||||
}
|
||||
|
||||
function is(a, b, msg) {
|
||||
dump("IS: " + (a===b) + " => " + a + " | " + b + " " + msg + "\n");
|
||||
postMessage({type: 'status', status: a === b, msg: a + " === " + b + ": " + msg });
|
||||
}
|
||||
|
||||
function isnot(a, b, msg) {
|
||||
dump("ISNOT: " + (a!==b) + " => " + a + " | " + b + " " + msg + "\n");
|
||||
postMessage({type: 'status', status: a !== b, msg: a + " !== " + b + ": " + msg });
|
||||
}
|
||||
|
||||
function promiseResolve() {
|
||||
ok(Promise, "Promise object should exist");
|
||||
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
ok(resolve, "Promise.resolve exists");
|
||||
ok(reject, "Promise.reject exists");
|
||||
|
||||
resolve(42);
|
||||
}).then(function(what) {
|
||||
ok(true, "Then - resolveCb has been called");
|
||||
is(what, 42, "ResolveCb received 42");
|
||||
runTest();
|
||||
}, function() {
|
||||
ok(false, "Then - rejectCb has been called");
|
||||
runTest();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
function promiseReject() {
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
reject(42);
|
||||
}).then(function(what) {
|
||||
ok(false, "Then - resolveCb has been called");
|
||||
runTest();
|
||||
}, function(what) {
|
||||
ok(true, "Then - rejectCb has been called");
|
||||
is(what, 42, "RejectCb received 42");
|
||||
runTest();
|
||||
});
|
||||
}
|
||||
|
||||
function promiseException() {
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
throw 42;
|
||||
}).then(function(what) {
|
||||
ok(false, "Then - resolveCb has been called");
|
||||
runTest();
|
||||
}, function(what) {
|
||||
ok(true, "Then - rejectCb has been called");
|
||||
is(what, 42, "RejectCb received 42");
|
||||
runTest();
|
||||
});
|
||||
}
|
||||
|
||||
function promiseAsync() {
|
||||
var global = "foo";
|
||||
var f = new Promise(function(r1, r2) {
|
||||
is(global, "foo", "Global should be foo");
|
||||
r1(42);
|
||||
is(global, "foo", "Global should still be foo");
|
||||
setTimeout(function() {
|
||||
is(global, "bar", "Global should still be bar!");
|
||||
runTest();
|
||||
}, 0);
|
||||
}).then(function() {
|
||||
global = "bar";
|
||||
});
|
||||
is(global, "foo", "Global should still be foo (2)");
|
||||
}
|
||||
|
||||
function promiseDoubleThen() {
|
||||
var steps = 0;
|
||||
var promise = new Promise(function(r1, r2) {
|
||||
r1(42);
|
||||
});
|
||||
|
||||
promise.then(function(what) {
|
||||
ok(true, "Then.resolve has been called");
|
||||
is(what, 42, "Value == 42");
|
||||
steps++;
|
||||
}, function(what) {
|
||||
ok(false, "Then.reject has been called");
|
||||
});
|
||||
|
||||
promise.then(function(what) {
|
||||
ok(true, "Then.resolve has been called");
|
||||
is(steps, 1, "Then.resolve - step == 1");
|
||||
is(what, 42, "Value == 42");
|
||||
runTest();
|
||||
}, function(what) {
|
||||
ok(false, "Then.reject has been called");
|
||||
});
|
||||
}
|
||||
|
||||
function promiseThenException() {
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
resolve(42);
|
||||
});
|
||||
|
||||
promise.then(function(what) {
|
||||
ok(true, "Then.resolve has been called");
|
||||
throw "booh";
|
||||
}).catch(function(e) {
|
||||
ok(true, "Catch has been called!");
|
||||
runTest();
|
||||
});
|
||||
}
|
||||
|
||||
function promiseThenCatchThen() {
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
resolve(42);
|
||||
});
|
||||
|
||||
var promise2 = promise.then(function(what) {
|
||||
ok(true, "Then.resolve has been called");
|
||||
is(what, 42, "Value == 42");
|
||||
return what + 1;
|
||||
}, function(what) {
|
||||
ok(false, "Then.reject has been called");
|
||||
});
|
||||
|
||||
isnot(promise, promise2, "These 2 promise objs are different");
|
||||
|
||||
promise2.then(function(what) {
|
||||
ok(true, "Then.resolve has been called");
|
||||
is(what, 43, "Value == 43");
|
||||
return what + 1;
|
||||
}, function(what) {
|
||||
ok(false, "Then.reject has been called");
|
||||
}).catch(function() {
|
||||
ok(false, "Catch has been called");
|
||||
}).then(function(what) {
|
||||
ok(true, "Then.resolve has been called");
|
||||
is(what, 44, "Value == 44");
|
||||
runTest();
|
||||
}, function(what) {
|
||||
ok(false, "Then.reject has been called");
|
||||
});
|
||||
}
|
||||
|
||||
function promiseRejectThenCatchThen() {
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
reject(42);
|
||||
});
|
||||
|
||||
var promise2 = promise.then(function(what) {
|
||||
ok(false, "Then.resolve has been called");
|
||||
}, function(what) {
|
||||
ok(true, "Then.reject has been called");
|
||||
is(what, 42, "Value == 42");
|
||||
return what + 1;
|
||||
});
|
||||
|
||||
isnot(promise, promise2, "These 2 promise objs are different");
|
||||
|
||||
promise2.then(function(what) {
|
||||
ok(true, "Then.resolve has been called");
|
||||
is(what, 43, "Value == 43");
|
||||
return what+1;
|
||||
}).catch(function(what) {
|
||||
ok(false, "Catch has been called");
|
||||
}).then(function(what) {
|
||||
ok(true, "Then.resolve has been called");
|
||||
is(what, 44, "Value == 44");
|
||||
runTest();
|
||||
});
|
||||
}
|
||||
|
||||
function promiseRejectThenCatchThen2() {
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
reject(42);
|
||||
});
|
||||
|
||||
promise.then(function(what) {
|
||||
ok(true, "Then.resolve has been called");
|
||||
is(what, 42, "Value == 42");
|
||||
return what+1;
|
||||
}).catch(function(what) {
|
||||
is(what, 42, "Value == 42");
|
||||
ok(true, "Catch has been called");
|
||||
return what+1;
|
||||
}).then(function(what) {
|
||||
ok(true, "Then.resolve has been called");
|
||||
is(what, 43, "Value == 43");
|
||||
runTest();
|
||||
});
|
||||
}
|
||||
|
||||
function promiseRejectThenCatchExceptionThen() {
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
reject(42);
|
||||
});
|
||||
|
||||
promise.then(function(what) {
|
||||
ok(false, "Then.resolve has been called");
|
||||
}, function(what) {
|
||||
ok(true, "Then.reject has been called");
|
||||
is(what, 42, "Value == 42");
|
||||
throw(what + 1);
|
||||
}).catch(function(what) {
|
||||
ok(true, "Catch has been called");
|
||||
is(what, 43, "Value == 43");
|
||||
return what + 1;
|
||||
}).then(function(what) {
|
||||
ok(true, "Then.resolve has been called");
|
||||
is(what, 44, "Value == 44");
|
||||
runTest();
|
||||
});
|
||||
}
|
||||
|
||||
function promiseThenCatchOrderingResolve() {
|
||||
var global = 0;
|
||||
var f = new Promise(function(r1, r2) {
|
||||
r1(42);
|
||||
});
|
||||
|
||||
f.then(function() {
|
||||
f.then(function() {
|
||||
global++;
|
||||
});
|
||||
f.catch(function() {
|
||||
global++;
|
||||
});
|
||||
f.then(function() {
|
||||
global++;
|
||||
});
|
||||
setTimeout(function() {
|
||||
is(global, 2, "Many steps... should return 2");
|
||||
runTest();
|
||||
}, 0);
|
||||
});
|
||||
}
|
||||
|
||||
function promiseThenCatchOrderingReject() {
|
||||
var global = 0;
|
||||
var f = new Promise(function(r1, r2) {
|
||||
r2(42);
|
||||
})
|
||||
|
||||
f.then(function() {}, function() {
|
||||
f.then(function() {
|
||||
global++;
|
||||
});
|
||||
f.catch(function() {
|
||||
global++;
|
||||
});
|
||||
f.then(function() {}, function() {
|
||||
global++;
|
||||
});
|
||||
setTimeout(function() {
|
||||
is(global, 2, "Many steps... should return 2");
|
||||
runTest();
|
||||
}, 0);
|
||||
});
|
||||
}
|
||||
|
||||
function promiseNestedPromise() {
|
||||
new Promise(function(resolve, reject) {
|
||||
resolve(new Promise(function(resolve, reject) {
|
||||
ok(true, "Nested promise is executed");
|
||||
resolve(42);
|
||||
}));
|
||||
}).then(function(value) {
|
||||
is(value, 42, "Nested promise is executed and then == 42");
|
||||
runTest();
|
||||
});
|
||||
}
|
||||
|
||||
function promiseNestedNestedPromise() {
|
||||
new Promise(function(resolve, reject) {
|
||||
resolve(new Promise(function(resolve, reject) {
|
||||
ok(true, "Nested promise is executed");
|
||||
resolve(42);
|
||||
}).then(function(what) { return what+1; }));
|
||||
}).then(function(value) {
|
||||
is(value, 43, "Nested promise is executed and then == 43");
|
||||
runTest();
|
||||
});
|
||||
}
|
||||
|
||||
function promiseWrongNestedPromise() {
|
||||
new Promise(function(resolve, reject) {
|
||||
resolve(new Promise(function(r, r2) {
|
||||
ok(true, "Nested promise is executed");
|
||||
r(42);
|
||||
}));
|
||||
reject(42);
|
||||
}).then(function(value) {
|
||||
is(value, 42, "Nested promise is executed and then == 42");
|
||||
runTest();
|
||||
}, function(value) {
|
||||
ok(false, "This is wrong");
|
||||
});
|
||||
}
|
||||
|
||||
function promiseLoop() {
|
||||
new Promise(function(resolve, reject) {
|
||||
resolve(new Promise(function(r1, r2) {
|
||||
ok(true, "Nested promise is executed");
|
||||
r1(new Promise(function(r1, r2) {
|
||||
ok(true, "Nested nested promise is executed");
|
||||
r1(42);
|
||||
}));
|
||||
}));
|
||||
}).then(function(value) {
|
||||
is(value, 42, "Nested nested promise is executed and then == 42");
|
||||
runTest();
|
||||
}, function(value) {
|
||||
ok(false, "This is wrong");
|
||||
});
|
||||
}
|
||||
|
||||
function promiseStaticReject() {
|
||||
var promise = Promise.reject(42).then(function(what) {
|
||||
ok(false, "This should not be called");
|
||||
}, function(what) {
|
||||
is(what, 42, "Value == 42");
|
||||
runTest();
|
||||
});
|
||||
}
|
||||
|
||||
function promiseStaticResolve() {
|
||||
var promise = Promise.resolve(42).then(function(what) {
|
||||
is(what, 42, "Value == 42");
|
||||
runTest();
|
||||
}, function() {
|
||||
ok(false, "This should not be called");
|
||||
});
|
||||
}
|
||||
|
||||
function promiseResolveNestedPromise() {
|
||||
var promise = Promise.resolve(new Promise(function(r, r2) {
|
||||
ok(true, "Nested promise is executed");
|
||||
r(42);
|
||||
}, function() {
|
||||
ok(false, "This should not be called");
|
||||
})).then(function(what) {
|
||||
is(what, 42, "Value == 42");
|
||||
runTest();
|
||||
}, function() {
|
||||
ok(false, "This should not be called");
|
||||
});
|
||||
}
|
||||
|
||||
function promiseRejectNoHandler() {
|
||||
// This test only checks that the code that reports unhandled errors in the
|
||||
// Promises implementation does not crash or leak.
|
||||
var promise = new Promise(function(res, rej) {
|
||||
noSuchMethod();
|
||||
});
|
||||
runTest();
|
||||
}
|
||||
|
||||
var tests = [
|
||||
promiseResolve,
|
||||
promiseReject,
|
||||
promiseException,
|
||||
promiseAsync,
|
||||
promiseDoubleThen,
|
||||
promiseThenException,
|
||||
promiseThenCatchThen,
|
||||
promiseRejectThenCatchThen,
|
||||
promiseRejectThenCatchThen2,
|
||||
promiseRejectThenCatchExceptionThen,
|
||||
promiseThenCatchOrderingResolve,
|
||||
promiseThenCatchOrderingReject,
|
||||
promiseNestedPromise,
|
||||
promiseNestedNestedPromise,
|
||||
promiseWrongNestedPromise,
|
||||
promiseLoop,
|
||||
promiseStaticReject,
|
||||
promiseStaticResolve,
|
||||
promiseResolveNestedPromise,
|
||||
promiseRejectNoHandler,
|
||||
];
|
||||
|
||||
function runTest() {
|
||||
if (!tests.length) {
|
||||
postMessage({ type: 'finish' });
|
||||
return;
|
||||
}
|
||||
|
||||
var test = tests.shift();
|
||||
test();
|
||||
}
|
||||
|
||||
onmessage = function() {
|
||||
runTest();
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
<!--
|
||||
Any copyright is dedicated to the Public Domain.
|
||||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<title>Test for Promise object in workers</title>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
</head>
|
||||
<body>
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none"></div>
|
||||
<pre id="test"></pre>
|
||||
<script class="testbody" type="text/javascript">
|
||||
|
||||
function runTest() {
|
||||
var worker = new Worker("promise_worker.js");
|
||||
|
||||
worker.onmessage = function(event) {
|
||||
|
||||
if (event.data.type == 'finish') {
|
||||
SimpleTest.finish();
|
||||
} else if (event.data.type == 'status') {
|
||||
ok(event.data.status, event.data.msg);
|
||||
}
|
||||
}
|
||||
|
||||
worker.onerror = function(event) {
|
||||
ok(false, "Worker had an error: " + event.data);
|
||||
SimpleTest.finish();
|
||||
};
|
||||
|
||||
worker.postMessage(true);
|
||||
}
|
||||
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
SpecialPowers.pushPrefEnv({"set": [["dom.promise.enabled", true]]}, runTest);
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Загрузка…
Ссылка в новой задаче