From 8ee8721f0d2990645e4700d75fbf1a120094d9a9 Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Wed, 20 Sep 2017 10:15:06 -0700 Subject: [PATCH] Bug 958643, part 2 - Remove always-null last argument to NativeInterface2JSObject. r=krizsa MozReview-Commit-ID: G9F6wlMWCl9 --HG-- extra : rebase_source : 313a40850965fc1a2488ef60deaf9d1cb2705806 --- js/xpconnect/src/nsXPConnect.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp index 1a3c0de611ea..9e3c62b61386 100644 --- a/js/xpconnect/src/nsXPConnect.cpp +++ b/js/xpconnect/src/nsXPConnect.cpp @@ -607,15 +607,14 @@ NativeInterface2JSObject(HandleObject aScope, nsWrapperCache* aCache, const nsIID * aIID, bool aAllowWrapping, - MutableHandleValue aVal, - nsIXPConnectJSObjectHolder** aHolder) + MutableHandleValue aVal) { AutoJSContext cx; JSAutoCompartment ac(cx, aScope); nsresult rv; xpcObjectHelper helper(aCOMObj, aCache); - if (!XPCConvert::NativeInterface2JSObject(aVal, aHolder, helper, aIID, + if (!XPCConvert::NativeInterface2JSObject(aVal, nullptr, helper, aIID, aAllowWrapping, &rv)) return rv; @@ -639,7 +638,7 @@ nsXPConnect::WrapNative(JSContext * aJSContext, RootedObject aScope(aJSContext, aScopeArg); RootedValue v(aJSContext); nsresult rv = NativeInterface2JSObject(aScope, aCOMObj, nullptr, &aIID, - true, &v, nullptr); + true, &v); if (NS_FAILED(rv)) return rv; @@ -665,7 +664,7 @@ nsXPConnect::WrapNativeToJSVal(JSContext* aJSContext, RootedObject aScope(aJSContext, aScopeArg); return NativeInterface2JSObject(aScope, aCOMObj, aCache, aIID, - aAllowWrapping, aVal, nullptr); + aAllowWrapping, aVal); } NS_IMETHODIMP