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 /js/xpconnect | |
| parent | 8220776c9b2e8291f0414f98ac20fbda30e00d2e (diff) | |
| download | uxp-fb96b43b5f6188233710c5f8c9c9e46baa9cb369.tar.gz | |
Issue #1322 - Part 1: Remove the DOM Promise guts.
This removes all the parts guarded by SPIDERMONKEY_PROMISE
Diffstat (limited to 'js/xpconnect')
| -rw-r--r-- | js/xpconnect/src/Sandbox.cpp | 7 | ||||
| -rw-r--r-- | js/xpconnect/src/XPCConvert.cpp | 4 |
2 files changed, 0 insertions, 11 deletions
diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp index a516cf73fb..d6e1cb173f 100644 --- a/js/xpconnect/src/Sandbox.cpp +++ b/js/xpconnect/src/Sandbox.cpp @@ -1206,13 +1206,6 @@ xpc::CreateSandboxObject(JSContext* cx, MutableHandleValue vp, nsISupports* prin if (!options.globalProperties.DefineInSandbox(cx, sandbox)) return NS_ERROR_XPC_UNEXPECTED; - -#ifndef SPIDERMONKEY_PROMISE - // Promise is supposed to be part of ES, and therefore should appear on - // every global. - if (!dom::PromiseBinding::GetConstructorObject(cx)) - return NS_ERROR_XPC_UNEXPECTED; -#endif // SPIDERMONKEY_PROMISE } // We handle the case where the context isn't in a compartment for the diff --git a/js/xpconnect/src/XPCConvert.cpp b/js/xpconnect/src/XPCConvert.cpp index 77f09f4a54..d158cdd624 100644 --- a/js/xpconnect/src/XPCConvert.cpp +++ b/js/xpconnect/src/XPCConvert.cpp @@ -799,7 +799,6 @@ XPCConvert::NativeInterface2JSObject(MutableHandleValue d, return CreateHolderIfNeeded(flat, d, dest); } -#ifdef SPIDERMONKEY_PROMISE if (iid->Equals(NS_GET_IID(nsISupports))) { // Check for a Promise being returned via nsISupports. In that // situation, we want to dig out its underlying JS object and return @@ -812,7 +811,6 @@ XPCConvert::NativeInterface2JSObject(MutableHandleValue d, return CreateHolderIfNeeded(flat, d, dest); } } -#endif // SPIDERMONKEY_PROMISE // Don't double wrap CPOWs. This is a temporary measure for compatibility // with objects that don't provide necessary QIs (such as objects under @@ -955,7 +953,6 @@ XPCConvert::JSObject2NativeInterface(void** dest, HandleObject src, return false; } -#ifdef SPIDERMONKEY_PROMISE // Deal with Promises being passed as nsISupports. In that situation we // want to create a dom::Promise and use that. if (iid->Equals(NS_GET_IID(nsISupports))) { @@ -966,7 +963,6 @@ XPCConvert::JSObject2NativeInterface(void** dest, HandleObject src, return p && NS_SUCCEEDED(p->QueryInterface(*iid, dest)); } } -#endif // SPIDERMONKEY_PROMISE } RefPtr<nsXPCWrappedJS> wrapper; |