diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 16:32:52 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 16:32:52 +0100 |
| commit | 0dca00b282fb06ec1512bccafd32e0a919242208 (patch) | |
| tree | 1f443869475eb32a8a8babfdf68b74b6d4d601cb /js/src/proxy | |
| parent | 76fe52eb81db323ceaa8396de39b76efbce1c25e (diff) | |
| parent | 0b6d9a47051be9ef4d064c6f7c60717da91d0bc2 (diff) | |
| download | UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.gz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.lz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.xz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'js/src/proxy')
| -rw-r--r-- | js/src/proxy/OpaqueCrossCompartmentWrapper.cpp | 8 | ||||
| -rw-r--r-- | js/src/proxy/ScriptedProxyHandler.cpp | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/js/src/proxy/OpaqueCrossCompartmentWrapper.cpp b/js/src/proxy/OpaqueCrossCompartmentWrapper.cpp index ff3f4145c..02bf237ff 100644 --- a/js/src/proxy/OpaqueCrossCompartmentWrapper.cpp +++ b/js/src/proxy/OpaqueCrossCompartmentWrapper.cpp @@ -175,6 +175,14 @@ OpaqueCrossCompartmentWrapper::isArray(JSContext* cx, HandleObject obj, return true; } +bool OpaqueCrossCompartmentWrapper::hasInstance(JSContext* cx, + HandleObject wrapper, + MutableHandleValue v, + bool* bp) const { + *bp = false; + return true; +} + const char* OpaqueCrossCompartmentWrapper::className(JSContext* cx, HandleObject proxy) const diff --git a/js/src/proxy/ScriptedProxyHandler.cpp b/js/src/proxy/ScriptedProxyHandler.cpp index 776547337..0e25f470c 100644 --- a/js/src/proxy/ScriptedProxyHandler.cpp +++ b/js/src/proxy/ScriptedProxyHandler.cpp @@ -8,8 +8,6 @@ #include "jsapi.h" -#include "vm/Interpreter.h" // For InstanceOfOperator - #include "jsobjinlines.h" #include "vm/NativeObject-inl.h" @@ -1230,7 +1228,7 @@ bool ScriptedProxyHandler::hasInstance(JSContext* cx, HandleObject proxy, MutableHandleValue v, bool* bp) const { - return InstanceOfOperator(cx, proxy, v, bp); + return InstanceofOperator(cx, proxy, v, bp); } bool |