diff options
| author | New Tobin Paradigm <email@mattatobin.com> | 2019-12-18 23:07:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-18 23:07:31 -0500 |
| commit | 3332f584c829aaac455d688c6c073937442c4c7f (patch) | |
| tree | 741e4325721d1d8d9970e075320262097d3cbeb1 /js/xpconnect/src/XPCConvert.cpp | |
| parent | 8220776c9b2e8291f0414f98ac20fbda30e00d2e (diff) | |
| parent | c7ae364a887e9fb77196596d6e4345b455ab209f (diff) | |
| download | UXP-3332f584c829aaac455d688c6c073937442c4c7f.tar UXP-3332f584c829aaac455d688c6c073937442c4c7f.tar.gz UXP-3332f584c829aaac455d688c6c073937442c4c7f.tar.lz UXP-3332f584c829aaac455d688c6c073937442c4c7f.tar.xz UXP-3332f584c829aaac455d688c6c073937442c4c7f.zip | |
Merge pull request #1330 from MoonchildProductions/DOM-promise-removal
DOM `Promise` removal
Diffstat (limited to 'js/xpconnect/src/XPCConvert.cpp')
| -rw-r--r-- | js/xpconnect/src/XPCConvert.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/js/xpconnect/src/XPCConvert.cpp b/js/xpconnect/src/XPCConvert.cpp index 77f09f4a5..d158cdd62 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; |