summaryrefslogtreecommitdiffstats
path: root/js/xpconnect
diff options
context:
space:
mode:
Diffstat (limited to 'js/xpconnect')
-rw-r--r--js/xpconnect/src/Sandbox.cpp7
-rw-r--r--js/xpconnect/src/XPCConvert.cpp4
2 files changed, 0 insertions, 11 deletions
diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp
index a516cf73f..d6e1cb173 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 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;