diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-19 01:35:24 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-19 01:35:24 +0100 |
| commit | fb96b43b5f6188233710c5f8c9c9e46baa9cb369 (patch) | |
| tree | 54124a46275f833ecd9f6e63246e092a93843fb0 /xpcom/base/CycleCollectedJSContext.cpp | |
| parent | 8220776c9b2e8291f0414f98ac20fbda30e00d2e (diff) | |
| download | UXP-fb96b43b5f6188233710c5f8c9c9e46baa9cb369.tar UXP-fb96b43b5f6188233710c5f8c9c9e46baa9cb369.tar.gz UXP-fb96b43b5f6188233710c5f8c9c9e46baa9cb369.tar.lz UXP-fb96b43b5f6188233710c5f8c9c9e46baa9cb369.tar.xz UXP-fb96b43b5f6188233710c5f8c9c9e46baa9cb369.zip | |
Issue #1322 - Part 1: Remove the DOM Promise guts.
This removes all the parts guarded by SPIDERMONKEY_PROMISE
Diffstat (limited to 'xpcom/base/CycleCollectedJSContext.cpp')
| -rw-r--r-- | xpcom/base/CycleCollectedJSContext.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/xpcom/base/CycleCollectedJSContext.cpp b/xpcom/base/CycleCollectedJSContext.cpp index 206984656..e16c15455 100644 --- a/xpcom/base/CycleCollectedJSContext.cpp +++ b/xpcom/base/CycleCollectedJSContext.cpp @@ -468,10 +468,8 @@ CycleCollectedJSContext::~CycleCollectedJSContext() MOZ_ASSERT(mDebuggerPromiseMicroTaskQueue.empty()); MOZ_ASSERT(mPromiseMicroTaskQueue.empty()); -#ifdef SPIDERMONKEY_PROMISE mUncaughtRejections.reset(); mConsumedRejections.reset(); -#endif // SPIDERMONKEY_PROMISE JS_DestroyContext(mJSContext); mJSContext = nullptr; @@ -544,12 +542,10 @@ CycleCollectedJSContext::Initialize(JSContext* aParentContext, JS::SetGetIncumbentGlobalCallback(mJSContext, GetIncumbentGlobalCallback); -#ifdef SPIDERMONKEY_PROMISE JS::SetEnqueuePromiseJobCallback(mJSContext, EnqueuePromiseJobCallback, this); JS::SetPromiseRejectionTrackerCallback(mJSContext, PromiseRejectionTrackerCallback, this); mUncaughtRejections.init(mJSContext, JS::GCVector<JSObject*, 0, js::SystemAllocPolicy>(js::SystemAllocPolicy())); mConsumedRejections.init(mJSContext, JS::GCVector<JSObject*, 0, js::SystemAllocPolicy>(js::SystemAllocPolicy())); -#endif // SPIDERMONKEY_PROMISE JS::dbg::SetDebuggerMallocSizeOf(mJSContext, moz_malloc_size_of); @@ -975,7 +971,6 @@ CycleCollectedJSContext::EnqueuePromiseJobCallback(JSContext* aCx, return true; } -#ifdef SPIDERMONKEY_PROMISE /* static */ void CycleCollectedJSContext::PromiseRejectionTrackerCallback(JSContext* aCx, @@ -995,7 +990,6 @@ CycleCollectedJSContext::PromiseRejectionTrackerCallback(JSContext* aCx, PromiseDebugging::AddConsumedRejection(aPromise); } } -#endif // SPIDERMONKEY_PROMISE struct JsGcTracer : public TraceCallbacks { |