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 /dom/bindings/ToJSValue.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 'dom/bindings/ToJSValue.cpp')
| -rw-r--r-- | dom/bindings/ToJSValue.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/dom/bindings/ToJSValue.cpp b/dom/bindings/ToJSValue.cpp index d84428fb3..7afff41e2 100644 --- a/dom/bindings/ToJSValue.cpp +++ b/dom/bindings/ToJSValue.cpp @@ -7,9 +7,7 @@ #include "mozilla/dom/ToJSValue.h" #include "mozilla/dom/DOMException.h" #include "mozilla/dom/Exceptions.h" -#ifdef SPIDERMONKEY_PROMISE #include "mozilla/dom/Promise.h" -#endif // SPIDERMONKEY_PROMISE #include "nsAString.h" #include "nsContentUtils.h" #include "nsStringBuffer.h" @@ -66,15 +64,13 @@ ToJSValue(JSContext* aCx, return true; } -#ifdef SPIDERMONKEY_PROMISE bool ToJSValue(JSContext* aCx, Promise& aArgument, JS::MutableHandle<JS::Value> aValue) { aValue.setObject(*aArgument.PromiseObj()); - return true; + return MaybeWrapObjectValue(aCx, aValue); } -#endif // SPIDERMONKEY_PROMISE } // namespace dom } // namespace mozilla |