mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-28 19:37:32 +09:00
Issue #1322 - Part 1: Remove the DOM Promise guts.
This removes all the parts guarded by SPIDERMONKEY_PROMISE
This commit is contained in:
wolfbeast
Roy Tam
parent
ad9793b896
commit
40f99b202a
27 changed files with 66 additions and 4009 deletions
|
|
@ -21,17 +21,6 @@
|
|||
#include "js/TypeDecls.h"
|
||||
#include "jspubtd.h"
|
||||
|
||||
// Bug 1083361 introduces a new mechanism for tracking uncaught
|
||||
// rejections. This #define serves to track down the parts of code
|
||||
// that need to be removed once clients have been put together
|
||||
// to take advantage of the new mechanism. New code should not
|
||||
// depend on code #ifdefed to this #define.
|
||||
#define DOM_PROMISE_DEPRECATED_REPORTING !SPIDERMONKEY_PROMISE
|
||||
|
||||
#if defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
#include "mozilla/dom/workers/bindings/WorkerHolder.h"
|
||||
#endif // defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
|
||||
class nsIGlobalObject;
|
||||
|
||||
namespace mozilla {
|
||||
|
|
@ -40,88 +29,36 @@ namespace dom {
|
|||
class AnyCallback;
|
||||
class DOMError;
|
||||
class MediaStreamError;
|
||||
class PromiseCallback;
|
||||
class PromiseInit;
|
||||
class PromiseNativeHandler;
|
||||
class PromiseDebugging;
|
||||
|
||||
class Promise;
|
||||
|
||||
#if defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
class PromiseReportRejectWorkerHolder : public workers::WorkerHolder
|
||||
{
|
||||
// PromiseReportRejectWorkerHolder is held by an nsAutoPtr on the Promise
|
||||
// which means that this object will be destroyed before the Promise is
|
||||
// destroyed.
|
||||
Promise* MOZ_NON_OWNING_REF mPromise;
|
||||
|
||||
public:
|
||||
explicit PromiseReportRejectWorkerHolder(Promise* aPromise)
|
||||
: mPromise(aPromise)
|
||||
{
|
||||
MOZ_ASSERT(mPromise);
|
||||
}
|
||||
|
||||
virtual bool
|
||||
Notify(workers::Status aStatus) override;
|
||||
};
|
||||
#endif // defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
|
||||
#define NS_PROMISE_IID \
|
||||
{ 0x1b8d6215, 0x3e67, 0x43ba, \
|
||||
{ 0x8a, 0xf9, 0x31, 0x5e, 0x8f, 0xce, 0x75, 0x65 } }
|
||||
|
||||
class Promise : public nsISupports,
|
||||
#ifndef SPIDERMONKEY_PROMISE
|
||||
// Only wrappercached when we're not using SpiderMonkey
|
||||
// promises, because those don't have a useful object moved
|
||||
// hook, which wrappercache needs.
|
||||
public nsWrapperCache,
|
||||
#endif // SPIDERMONKEY_PROMISE
|
||||
public SupportsWeakPtr<Promise>
|
||||
{
|
||||
friend class NativePromiseCallback;
|
||||
friend class PromiseReactionJob;
|
||||
friend class PromiseResolverTask;
|
||||
friend class PromiseTask;
|
||||
#if defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
friend class PromiseReportRejectWorkerHolder;
|
||||
#endif // defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
friend class PromiseWorkerProxy;
|
||||
friend class PromiseWorkerProxyRunnable;
|
||||
friend class RejectPromiseCallback;
|
||||
friend class ResolvePromiseCallback;
|
||||
friend class PromiseResolveThenableJob;
|
||||
friend class FastPromiseResolveThenableJob;
|
||||
friend class WrapperPromiseCallback;
|
||||
|
||||
public:
|
||||
NS_DECLARE_STATIC_IID_ACCESSOR(NS_PROMISE_IID)
|
||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||
#ifdef SPIDERMONKEY_PROMISE
|
||||
// We're not skippable, since we're not owned from JS to start with.
|
||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Promise)
|
||||
#else // SPIDERMONKEY_PROMISE
|
||||
NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(Promise)
|
||||
#endif // SPIDERMONKEY_PROMISE
|
||||
MOZ_DECLARE_WEAKREFERENCE_TYPENAME(Promise)
|
||||
|
||||
// Promise creation tries to create a JS reflector for the Promise, so is
|
||||
// fallible. Furthermore, we don't want to do JS-wrapping on a 0-refcount
|
||||
// object, so we addref before doing that and return the addrefed pointer
|
||||
// here.
|
||||
#ifdef SPIDERMONKEY_PROMISE
|
||||
static already_AddRefed<Promise>
|
||||
Create(nsIGlobalObject* aGlobal, ErrorResult& aRv);
|
||||
|
||||
// Reports a rejected Promise by sending an error report.
|
||||
static void ReportRejectedPromise(JSContext* aCx, JS::HandleObject aPromise);
|
||||
#else
|
||||
static already_AddRefed<Promise>
|
||||
Create(nsIGlobalObject* aGlobal, ErrorResult& aRv,
|
||||
// Passing null for aDesiredProto will use Promise.prototype.
|
||||
JS::Handle<JSObject*> aDesiredProto = nullptr);
|
||||
#endif // SPIDERMONKEY_PROMISE
|
||||
|
||||
typedef void (Promise::*MaybeFunc)(JSContext* aCx,
|
||||
JS::Handle<JS::Value> aValue);
|
||||
|
|
@ -183,7 +120,6 @@ public:
|
|||
return mGlobal;
|
||||
}
|
||||
|
||||
#ifdef SPIDERMONKEY_PROMISE
|
||||
bool
|
||||
WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto,
|
||||
JS::MutableHandle<JSObject*> aWrapper);
|
||||
|
|
@ -223,95 +159,17 @@ public:
|
|||
return mPromiseObj;
|
||||
}
|
||||
|
||||
#else // SPIDERMONKEY_PROMISE
|
||||
JSObject* PromiseObj()
|
||||
{
|
||||
return GetWrapper();
|
||||
}
|
||||
|
||||
virtual JSObject*
|
||||
WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
|
||||
|
||||
static already_AddRefed<Promise>
|
||||
Constructor(const GlobalObject& aGlobal, PromiseInit& aInit,
|
||||
ErrorResult& aRv, JS::Handle<JSObject*> aDesiredProto);
|
||||
|
||||
static void
|
||||
Resolve(const GlobalObject& aGlobal, JS::Handle<JS::Value> aThisv,
|
||||
JS::Handle<JS::Value> aValue,
|
||||
JS::MutableHandle<JS::Value> aRetval, ErrorResult& aRv);
|
||||
|
||||
static already_AddRefed<Promise>
|
||||
Resolve(nsIGlobalObject* aGlobal, JSContext* aCx,
|
||||
JS::Handle<JS::Value> aValue, ErrorResult& aRv);
|
||||
|
||||
static void
|
||||
Reject(const GlobalObject& aGlobal, JS::Handle<JS::Value> aThisv,
|
||||
JS::Handle<JS::Value> aValue,
|
||||
JS::MutableHandle<JS::Value> aRetval, ErrorResult& aRv);
|
||||
|
||||
static already_AddRefed<Promise>
|
||||
Reject(nsIGlobalObject* aGlobal, JSContext* aCx,
|
||||
JS::Handle<JS::Value> aValue, ErrorResult& aRv);
|
||||
|
||||
void
|
||||
Then(JSContext* aCx,
|
||||
// aCalleeGlobal may not be in the compartment of aCx, when called over
|
||||
// Xrays.
|
||||
JS::Handle<JSObject*> aCalleeGlobal,
|
||||
AnyCallback* aResolveCallback, AnyCallback* aRejectCallback,
|
||||
JS::MutableHandle<JS::Value> aRetval,
|
||||
ErrorResult& aRv);
|
||||
|
||||
void
|
||||
Catch(JSContext* aCx,
|
||||
AnyCallback* aRejectCallback,
|
||||
JS::MutableHandle<JS::Value> aRetval,
|
||||
ErrorResult& aRv);
|
||||
|
||||
static void
|
||||
All(const GlobalObject& aGlobal, JS::Handle<JS::Value> aThisv,
|
||||
JS::Handle<JS::Value> aIterable, JS::MutableHandle<JS::Value> aRetval,
|
||||
ErrorResult& aRv);
|
||||
|
||||
static already_AddRefed<Promise>
|
||||
All(const GlobalObject& aGlobal,
|
||||
const nsTArray<RefPtr<Promise>>& aPromiseList, ErrorResult& aRv);
|
||||
|
||||
static void
|
||||
Race(const GlobalObject& aGlobal, JS::Handle<JS::Value> aThisv,
|
||||
JS::Handle<JS::Value> aIterable, JS::MutableHandle<JS::Value> aRetval,
|
||||
ErrorResult& aRv);
|
||||
|
||||
static bool
|
||||
PromiseSpecies(JSContext* aCx, unsigned aArgc, JS::Value* aVp);
|
||||
#endif // SPIDERMONKEY_PROMISE
|
||||
|
||||
void AppendNativeHandler(PromiseNativeHandler* aRunnable);
|
||||
|
||||
JSObject* GlobalJSObject() const;
|
||||
|
||||
JSCompartment* Compartment() const;
|
||||
|
||||
#ifndef SPIDERMONKEY_PROMISE
|
||||
// Return a unique-to-the-process identifier for this Promise.
|
||||
uint64_t GetID();
|
||||
#endif // SPIDERMONKEY_PROMISE
|
||||
|
||||
#ifndef SPIDERMONKEY_PROMISE
|
||||
enum JSCallbackSlots {
|
||||
SLOT_PROMISE = 0,
|
||||
SLOT_DATA
|
||||
};
|
||||
#endif // SPIDERMONKEY_PROMISE
|
||||
|
||||
#ifdef SPIDERMONKEY_PROMISE
|
||||
// Create a dom::Promise from a given SpiderMonkey Promise object.
|
||||
// aPromiseObj MUST be in the compartment of aGlobal's global JS object.
|
||||
static already_AddRefed<Promise>
|
||||
CreateFromExisting(nsIGlobalObject* aGlobal,
|
||||
JS::Handle<JSObject*> aPromiseObj);
|
||||
#endif // SPIDERMONKEY_PROMISE
|
||||
|
||||
enum class PromiseState {
|
||||
Pending,
|
||||
|
|
@ -335,99 +193,7 @@ protected:
|
|||
// use the default prototype for the sort of Promise we have.
|
||||
void CreateWrapper(JS::Handle<JSObject*> aDesiredProto, ErrorResult& aRv);
|
||||
|
||||
#ifndef SPIDERMONKEY_PROMISE
|
||||
// Create the JS resolving functions of resolve() and reject(). And provide
|
||||
// references to the two functions by calling PromiseInit passed from Promise
|
||||
// constructor.
|
||||
void CallInitFunction(const GlobalObject& aGlobal, PromiseInit& aInit,
|
||||
ErrorResult& aRv);
|
||||
|
||||
// The NewPromiseCapability function from
|
||||
// <http://www.ecma-international.org/ecma-262/6.0/#sec-newpromisecapability>.
|
||||
// Errors are communicated via aRv. If aForceCallbackCreation is
|
||||
// true, then this function will ensure that aCapability has a
|
||||
// useful mResolve/mReject even if mNativePromise is non-null.
|
||||
static void NewPromiseCapability(JSContext* aCx, nsIGlobalObject* aGlobal,
|
||||
JS::Handle<JS::Value> aConstructor,
|
||||
bool aForceCallbackCreation,
|
||||
PromiseCapability& aCapability,
|
||||
ErrorResult& aRv);
|
||||
|
||||
bool IsPending()
|
||||
{
|
||||
return mResolvePending;
|
||||
}
|
||||
|
||||
void GetDependentPromises(nsTArray<RefPtr<Promise>>& aPromises);
|
||||
|
||||
bool IsLastInChain() const
|
||||
{
|
||||
return mIsLastInChain;
|
||||
}
|
||||
|
||||
void SetNotifiedAsUncaught()
|
||||
{
|
||||
mWasNotifiedAsUncaught = true;
|
||||
}
|
||||
|
||||
bool WasNotifiedAsUncaught() const
|
||||
{
|
||||
return mWasNotifiedAsUncaught;
|
||||
}
|
||||
#endif // SPIDERMONKEY_PROMISE
|
||||
|
||||
private:
|
||||
#ifndef SPIDERMONKEY_PROMISE
|
||||
friend class PromiseDebugging;
|
||||
|
||||
void SetState(PromiseState aState)
|
||||
{
|
||||
MOZ_ASSERT(mState == Pending);
|
||||
MOZ_ASSERT(aState != Pending);
|
||||
mState = aState;
|
||||
}
|
||||
|
||||
void SetResult(JS::Handle<JS::Value> aValue)
|
||||
{
|
||||
mResult = aValue;
|
||||
}
|
||||
|
||||
// This method enqueues promise's resolve/reject callbacks with promise's
|
||||
// result. It's executed when the resolver.resolve() or resolver.reject() is
|
||||
// called or when the promise already has a result and new callbacks are
|
||||
// appended by then() or catch().
|
||||
void TriggerPromiseReactions();
|
||||
|
||||
void Settle(JS::Handle<JS::Value> aValue, Promise::PromiseState aState);
|
||||
void MaybeSettle(JS::Handle<JS::Value> aValue, Promise::PromiseState aState);
|
||||
|
||||
void AppendCallbacks(PromiseCallback* aResolveCallback,
|
||||
PromiseCallback* aRejectCallback);
|
||||
|
||||
#if defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
// If we have been rejected and our mResult is a JS exception,
|
||||
// report it to the error console.
|
||||
// Use MaybeReportRejectedOnce() for actual calls.
|
||||
void MaybeReportRejected();
|
||||
|
||||
void MaybeReportRejectedOnce() {
|
||||
MaybeReportRejected();
|
||||
RemoveWorkerHolder();
|
||||
mResult.setUndefined();
|
||||
}
|
||||
#endif // defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
|
||||
void MaybeResolveInternal(JSContext* aCx,
|
||||
JS::Handle<JS::Value> aValue);
|
||||
void MaybeRejectInternal(JSContext* aCx,
|
||||
JS::Handle<JS::Value> aValue);
|
||||
|
||||
void ResolveInternal(JSContext* aCx,
|
||||
JS::Handle<JS::Value> aValue);
|
||||
void RejectInternal(JSContext* aCx,
|
||||
JS::Handle<JS::Value> aValue);
|
||||
#endif // SPIDERMONKEY_PROMISE
|
||||
|
||||
template <typename T>
|
||||
void MaybeSomething(T& aArgument, MaybeFunc aFunc) {
|
||||
MOZ_ASSERT(PromiseObj()); // It was preserved!
|
||||
|
|
@ -444,92 +210,11 @@ private:
|
|||
(this->*aFunc)(cx, val);
|
||||
}
|
||||
|
||||
#ifndef SPIDERMONKEY_PROMISE
|
||||
// Static methods for the PromiseInit functions.
|
||||
static bool
|
||||
JSCallback(JSContext *aCx, unsigned aArgc, JS::Value *aVp);
|
||||
|
||||
static bool
|
||||
ThenableResolverCommon(JSContext* aCx, uint32_t /* PromiseCallback::Task */ aTask,
|
||||
unsigned aArgc, JS::Value* aVp);
|
||||
static bool
|
||||
JSCallbackThenableResolver(JSContext *aCx, unsigned aArgc, JS::Value *aVp);
|
||||
static bool
|
||||
JSCallbackThenableRejecter(JSContext *aCx, unsigned aArgc, JS::Value *aVp);
|
||||
|
||||
static JSObject*
|
||||
CreateFunction(JSContext* aCx, Promise* aPromise, int32_t aTask);
|
||||
|
||||
static JSObject*
|
||||
CreateThenableFunction(JSContext* aCx, Promise* aPromise, uint32_t aTask);
|
||||
|
||||
#if defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
void RemoveWorkerHolder();
|
||||
#endif // defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
|
||||
// Capture the current stack and store it in aTarget. If false is
|
||||
// returned, an exception is presumably pending on aCx.
|
||||
bool CaptureStack(JSContext* aCx, JS::Heap<JSObject*>& aTarget);
|
||||
#endif // SPIDERMONKEY_PROMISE
|
||||
|
||||
void HandleException(JSContext* aCx);
|
||||
|
||||
RefPtr<nsIGlobalObject> mGlobal;
|
||||
|
||||
#ifndef SPIDERMONKEY_PROMISE
|
||||
nsTArray<RefPtr<PromiseCallback> > mResolveCallbacks;
|
||||
nsTArray<RefPtr<PromiseCallback> > mRejectCallbacks;
|
||||
|
||||
JS::Heap<JS::Value> mResult;
|
||||
// A stack that shows where this promise was allocated, if there was
|
||||
// JS running at the time. Otherwise null.
|
||||
JS::Heap<JSObject*> mAllocationStack;
|
||||
// mRejectionStack is only set when the promise is rejected directly from
|
||||
// script, by calling Promise.reject() or the rejection callback we pass to
|
||||
// the PromiseInit function. Promises that are rejected internally do not
|
||||
// have a rejection stack.
|
||||
JS::Heap<JSObject*> mRejectionStack;
|
||||
// mFullfillmentStack is only set when the promise is fulfilled directly from
|
||||
// script, by calling Promise.resolve() or the fulfillment callback we pass to
|
||||
// the PromiseInit function. Promises that are fulfilled internally do not
|
||||
// have a fulfillment stack.
|
||||
JS::Heap<JSObject*> mFullfillmentStack;
|
||||
PromiseState mState;
|
||||
|
||||
#if defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
bool mHadRejectCallback;
|
||||
|
||||
// If a rejected promise on a worker has no reject callbacks attached, it
|
||||
// needs to know when the worker is shutting down, to report the error on the
|
||||
// console before the worker's context is deleted. This feature is used for
|
||||
// that purpose.
|
||||
nsAutoPtr<PromiseReportRejectWorkerHolder> mWorkerHolder;
|
||||
#endif // defined(DOM_PROMISE_DEPRECATED_REPORTING)
|
||||
|
||||
bool mTaskPending;
|
||||
bool mResolvePending;
|
||||
|
||||
// `true` if this Promise is the last in the chain, or `false` if
|
||||
// another Promise has been created from this one by a call to
|
||||
// `then`, `all`, `race`, etc.
|
||||
bool mIsLastInChain;
|
||||
|
||||
// `true` if PromiseDebugging has already notified at least one observer that
|
||||
// this promise was left uncaught, `false` otherwise.
|
||||
bool mWasNotifiedAsUncaught;
|
||||
|
||||
// The time when this promise was created.
|
||||
TimeStamp mCreationTimestamp;
|
||||
|
||||
// The time when this promise transitioned out of the pending state.
|
||||
TimeStamp mSettlementTimestamp;
|
||||
|
||||
// Once `GetID()` has been called, a unique-to-the-process identifier for this
|
||||
// promise. Until then, `0`.
|
||||
uint64_t mID;
|
||||
#else // SPIDERMONKEY_PROMISE
|
||||
JS::Heap<JSObject*> mPromiseObj;
|
||||
#endif // SPIDERMONKEY_PROMISE
|
||||
};
|
||||
|
||||
NS_DEFINE_STATIC_IID_ACCESSOR(Promise, NS_PROMISE_IID)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue