Auto merge of #444 - AnshulMalik:optional-args, r=jdm

remove optional arguments from NewProxyObject Fixes #441  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-mozjs/444)
servo · Dec 21, 2018 · 2afcfa4 · 2afcfa4
2 parents f84b87a + ab8fc91
commit 2afcfa4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/glue.rs b/src/glue.rs
@@ -219,8 +219,7 @@ extern "C" {
     pub fn DeleteCompileOptions(aOpts: *mut ReadOnlyCompileOptions);
     pub fn NewProxyObject(aCx: *mut JSContext,
                           aHandler: *const ::libc::c_void, aPriv: HandleValue,
-                          proto: *mut JSObject, parent: *mut JSObject,
-                          call: *mut JSObject, construct: *mut JSObject)
+                          proto: *mut JSObject)
      -> *mut JSObject;
     pub fn WrapperNew(aCx: *mut JSContext, aObj: HandleObject,
                       aHandler: *const ::libc::c_void, aClass: *const JSClass,

diff --git a/src/glue_wrappers.in b/src/glue_wrappers.in
@@ -3,7 +3,7 @@ wrap!(glue: pub fn InvokeHasOwn(handler: *const ::libc::c_void, cx: *mut JSConte
 wrap!(glue: pub fn CallJitGetterOp(info: *const JSJitInfo, cx: *mut JSContext, thisObj: HandleObject, specializedThis: *mut ::libc::c_void, argc: u32, vp: *mut Value) -> bool);
 wrap!(glue: pub fn CallJitSetterOp(info: *const JSJitInfo, cx: *mut JSContext, thisObj: HandleObject, specializedThis: *mut ::libc::c_void, argc: u32, vp: *mut Value) -> bool);
 wrap!(glue: pub fn CallJitMethodOp(info: *const JSJitInfo, cx: *mut JSContext, thisObj: HandleObject, specializedThis: *mut ::libc::c_void, argc: u32, vp: *mut Value) -> bool);
-wrap!(glue: pub fn NewProxyObject(aCx: *mut JSContext, aHandler: *const ::libc::c_void, aPriv: HandleValue, proto: *mut JSObject, parent: *mut JSObject, call: *mut JSObject, construct: *mut JSObject) -> *mut JSObject);
+wrap!(glue: pub fn NewProxyObject(aCx: *mut JSContext, aHandler: *const ::libc::c_void, aPriv: HandleValue, proto: *mut JSObject) -> *mut JSObject);
 wrap!(glue: pub fn WrapperNew(aCx: *mut JSContext, aObj: HandleObject, aHandler: *const ::libc::c_void, aClass: *const JSClass, aSingleton: bool) -> *mut JSObject);
 wrap!(glue: pub fn NewWindowProxy(aCx: *mut JSContext, aObj: HandleObject, aHandler: *const ::libc::c_void) -> *mut JSObject);
 wrap!(glue: pub fn RUST_JSID_IS_INT(id: HandleId) -> bool);

diff --git a/src/jsglue.cpp b/src/jsglue.cpp
@@ -588,8 +588,7 @@ DeleteCompileOptions(JS::ReadOnlyCompileOptions *aOpts)
 
 JSObject*
 NewProxyObject(JSContext* aCx, const void* aHandler, JS::HandleValue aPriv,
-               JSObject* proto, JSObject* parent, JSObject* call,
-               JSObject* construct)
+               JSObject* proto)
 {
     js::ProxyOptions options;
     return js::NewProxyObject(aCx, (js::BaseProxyHandler*)aHandler, aPriv, proto,