diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2019-06-09 00:39:54 -0400 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2019-07-18 22:38:28 -0400 |
| commit | 2b0c3663441e51e7ec1fa32411e2339cf81e19b9 (patch) | |
| tree | 8e02ef7d80845dc17fc0fe3170d2d2efe38d5334 /js/src | |
| parent | bd6819820961aaed4c57949341fedc57feab7403 (diff) | |
| download | UXP-2b0c3663441e51e7ec1fa32411e2339cf81e19b9.tar UXP-2b0c3663441e51e7ec1fa32411e2339cf81e19b9.tar.gz UXP-2b0c3663441e51e7ec1fa32411e2339cf81e19b9.tar.lz UXP-2b0c3663441e51e7ec1fa32411e2339cf81e19b9.tar.xz UXP-2b0c3663441e51e7ec1fa32411e2339cf81e19b9.zip | |
1320408 - Part 22: Remove JSContext* parameter from ProxyObject::renew and Wrapper::Renew.
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/jswrapper.h | 2 | ||||
| -rw-r--r-- | js/src/proxy/Proxy.cpp | 2 | ||||
| -rw-r--r-- | js/src/proxy/Wrapper.cpp | 4 | ||||
| -rw-r--r-- | js/src/vm/ProxyObject.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h index 84ebe2732..5f3704e32 100644 --- a/js/src/jswrapper.h +++ b/js/src/jswrapper.h @@ -136,7 +136,7 @@ class JS_FRIEND_API(Wrapper) : public BaseProxyHandler static JSObject* New(JSContext* cx, JSObject* obj, const Wrapper* handler, const WrapperOptions& options = WrapperOptions()); - static JSObject* Renew(JSContext* cx, JSObject* existing, JSObject* obj, const Wrapper* handler); + static JSObject* Renew(JSObject* existing, JSObject* obj, const Wrapper* handler); static const Wrapper* wrapperHandler(JSObject* wrapper); diff --git a/js/src/proxy/Proxy.cpp b/js/src/proxy/Proxy.cpp index 026b40c7b..2c1cffb77 100644 --- a/js/src/proxy/Proxy.cpp +++ b/js/src/proxy/Proxy.cpp @@ -774,7 +774,7 @@ js::NewProxyObject(JSContext* cx, const BaseProxyHandler* handler, HandleValue p } void -ProxyObject::renew(JSContext* cx, const BaseProxyHandler* handler, const Value& priv) +ProxyObject::renew(const BaseProxyHandler* handler, const Value& priv) { MOZ_ASSERT(!IsInsideNursery(this)); MOZ_ASSERT_IF(IsCrossCompartmentWrapper(this), IsDeadProxyObject(this)); diff --git a/js/src/proxy/Wrapper.cpp b/js/src/proxy/Wrapper.cpp index 43d559ff3..67f437262 100644 --- a/js/src/proxy/Wrapper.cpp +++ b/js/src/proxy/Wrapper.cpp @@ -312,9 +312,9 @@ Wrapper::New(JSContext* cx, JSObject* obj, const Wrapper* handler, } JSObject* -Wrapper::Renew(JSContext* cx, JSObject* existing, JSObject* obj, const Wrapper* handler) +Wrapper::Renew(JSObject* existing, JSObject* obj, const Wrapper* handler) { - existing->as<ProxyObject>().renew(cx, handler, ObjectValue(*obj)); + existing->as<ProxyObject>().renew(handler, ObjectValue(*obj)); return existing; } diff --git a/js/src/vm/ProxyObject.h b/js/src/vm/ProxyObject.h index a0a929b20..d86d72cc9 100644 --- a/js/src/vm/ProxyObject.h +++ b/js/src/vm/ProxyObject.h @@ -104,7 +104,7 @@ class ProxyObject : public ShapedObject public: static unsigned grayLinkExtraSlot(JSObject* obj); - void renew(JSContext* cx, const BaseProxyHandler* handler, const Value& priv); + void renew(const BaseProxyHandler* handler, const Value& priv); static void trace(JSTracer* trc, JSObject* obj); |