Bug 865410 - Use CallArgs for XPConnect Call and Construct hooks. r=bholley.

dom/base/nsDOMClassInfo.cpp

@@ -2748,8 +2748,7 @@ nsDOMClassInfo::CheckAccess(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
 
 NS_IMETHODIMP
 nsDOMClassInfo::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                     JSObject *obj, uint32_t argc, jsval *argv, jsval *vp,
-                     bool *_retval)
+                     JSObject *obj, const JS::CallArgs &args, bool *_retval)
 {
   NS_WARNING("nsDOMClassInfo::Call Don't call me!");
 
@@ -2758,8 +2757,8 @@ nsDOMClassInfo::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
 
 NS_IMETHODIMP
 nsDOMClassInfo::Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                          JSObject *obj, uint32_t argc, jsval *argv,
-                          jsval *vp, bool *_retval)
+                          JSObject *obj, const JS::CallArgs &args,
+                          bool *_retval)
 {
   NS_WARNING("nsDOMClassInfo::Construct Don't call me!");
 
@@ -3746,8 +3745,8 @@ public:
   nsresult PreCreate(JSContext *cx, JSObject *globalObj, JSObject **parentObj);
 
   nsresult Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                     JS::Handle<JSObject*> obj, uint32_t argc, jsval *argv,
-                     jsval *vp, bool *_retval);
+                     JS::Handle<JSObject*> obj, const JS::CallArgs &args,
+                     bool *_retval););
 
   nsresult HasInstance(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                        JS::Handle<JSObject*> obj, const jsval &val, bool *bp,
@@ -3906,8 +3905,8 @@ nsDOMConstructor::PreCreate(JSContext *cx, JSObject *globalObj, JSObject **paren
 
 nsresult
 nsDOMConstructor::Construct(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                            JS::Handle<JSObject*> obj, uint32_t argc, jsval * argv,
-                            jsval * vp, bool *_retval)
+                            JS::Handle<JSObject*> obj, const JS::CallArgs &args,
+                            bool *_retval)
 {
   MOZ_ASSERT(obj);
 
@@ -3919,7 +3918,8 @@ nsDOMConstructor::Construct(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
     return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
   }
 
-  return BaseStubConstructor(mWeakOwner, name_struct, cx, obj, argc, argv, vp);
+  return BaseStubConstructor(mWeakOwner, name_struct, cx, obj, args.length(), args.array(),
+                             args.rval().address());
 }
 
 nsresult
@@ -7482,8 +7482,7 @@ nsDOMConstructorSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx
 
 NS_IMETHODIMP
 nsDOMConstructorSH::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                         JSObject *aObj, uint32_t argc, jsval *argv, jsval *vp,
-                         bool *_retval)
+                         JSObject *aObj, const JS::CallArgs &args, bool *_retval)
 {
   JS::Rooted<JSObject*> obj(cx, aObj);
   MOZ_ASSERT(obj);
@@ -7504,8 +7503,7 @@ nsDOMConstructorSH::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
 
 NS_IMETHODIMP
 nsDOMConstructorSH::Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                              JSObject *aObj, uint32_t argc, jsval *argv,
-                              jsval *vp, bool *_retval)
+                              JSObject *aObj, const JS::CallArgs &args, bool *_retval)
 {
   JS::Rooted<JSObject*> obj(cx, aObj);
   MOZ_ASSERT(obj);

dom/base/nsDOMClassInfo.h

@@ -1039,12 +1039,10 @@ public:
                         JSObject *obj, jsid id, uint32_t flags,
                         JSObject **objp, bool *_retval);
   NS_IMETHOD Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                  JSObject *obj, uint32_t argc, jsval *argv, jsval *vp,
-                  bool *_retval);
+                  JSObject *obj, const JS::CallArgs &args, bool *_retval);
 
   NS_IMETHOD Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                       JSObject *obj, uint32_t argc, jsval *argv,
-                       jsval *vp, bool *_retval);
+                       JSObject *obj, const JS::CallArgs &args, bool *_retval);
 
   NS_IMETHOD HasInstance(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                          JSObject *obj, const jsval &val, bool *bp,

js/xpconnect/idl/nsIXPCScriptable.idl

@@ -19,7 +19,7 @@
  * boolean to PR_TRUE before making the call.  Implementations may skip writing
  * to *_retval unless they want to return PR_FALSE.
  */
-[uuid(33b9d098-e680-4e4c-88a2-57cccceac145)]
+[uuid(155d1863-2b0b-4f5e-b800-05184944156b)]
 interface nsIXPCScriptable : nsISupports
 {
     /* bitflags used for 'flags' (only 32 bits available!) */
@@ -122,11 +122,11 @@ interface nsIXPCScriptable : nsISupports
 
     boolean call(in nsIXPConnectWrappedNative wrapper,
                 in JSContextPtr cx, in JSObjectPtr obj,
-                in uint32_t argc, in JSValPtr argv, in JSValPtr vp);
+                in JSCallArgsRef args);
 
     boolean construct(in nsIXPConnectWrappedNative wrapper,
                      in JSContextPtr cx, in JSObjectPtr obj,
-                     in uint32_t argc, in JSValPtr argv, in JSValPtr vp);
+                     in JSCallArgsRef args);
 
     boolean hasInstance(in nsIXPConnectWrappedNative wrapper,
                        in JSContextPtr cx, in JSObjectPtr obj,

js/xpconnect/idl/nsIXPConnect.idl

@@ -45,6 +45,7 @@ class nsWrapperCache;
 [ptr] native nsAXPCNativeCallContextPtr(nsAXPCNativeCallContext);
 [ptr] native nsWrapperCachePtr(nsWrapperCache);
       native ZoneSpecifier(uintptr_t);
+[ref] native JSCallArgsRef(const JS::CallArgs);
 
 /***************************************************************************/
 

js/xpconnect/public/xpc_map_end.h

@@ -158,12 +158,12 @@ NS_IMETHODIMP XPC_MAP_CLASSNAME::CheckAccess(nsIXPConnectWrappedNative *wrapper,
 #endif
 
 #ifndef XPC_MAP_WANT_CALL
-NS_IMETHODIMP XPC_MAP_CLASSNAME::Call(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, uint32_t argc, jsval * argv, jsval * vp, bool *_retval)
+NS_IMETHODIMP XPC_MAP_CLASSNAME::Call(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, const JS::CallArgs &args, bool *_retval)
     {NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
 #endif
 
 #ifndef XPC_MAP_WANT_CONSTRUCT
-NS_IMETHODIMP XPC_MAP_CLASSNAME::Construct(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, uint32_t argc, jsval * argv, jsval * vp, bool *_retval)
+NS_IMETHODIMP XPC_MAP_CLASSNAME::Construct(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, const JS::CallArgs &args, bool *_retval)
     {NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
 #endif
 

js/xpconnect/src/XPCComponents.cpp

@@ -1468,8 +1468,7 @@ public:
 private:
     static nsresult CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
                                     JSContext *cx, HandleObject obj,
-                                    uint32_t argc, Value *argv,
-                                    Value *vp, bool *_retval);
+                                    const CallArgs &args, bool *_retval);
 };
 
 /***************************************************************************/
@@ -1596,31 +1595,30 @@ NS_IMPL_THREADSAFE_RELEASE(nsXPCComponents_ID)
 /* bool call (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */
 NS_IMETHODIMP
 nsXPCComponents_ID::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx, JSObject *objArg,
-                         uint32_t argc, Value *argv, Value *vp, bool *_retval)
+                         const CallArgs &args, bool *_retval)
 {
     RootedObject obj(cx, objArg);
-    return CallOrConstruct(wrapper, cx, obj, argc, argv, vp, _retval);
+    return CallOrConstruct(wrapper, cx, obj, args, _retval);
 }
 
 /* bool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */
 NS_IMETHODIMP
 nsXPCComponents_ID::Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx, JSObject *objArg,
-                              uint32_t argc, Value *argv, Value *vp, bool *_retval)
+                              const CallArgs &args, bool *_retval)
 {
     RootedObject obj(cx, objArg);
-    return CallOrConstruct(wrapper, cx, obj, argc, argv, vp, _retval);
+    return CallOrConstruct(wrapper, cx, obj, args, _retval);
 }
 
 // static
 nsresult
 nsXPCComponents_ID::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
                                     JSContext *cx, HandleObject obj,
-                                    uint32_t argc, Value *argv,
-                                    Value *vp, bool *_retval)
+                                    const CallArgs &args, bool *_retval)
 {
     // make sure we have at least one arg
 
-    if (!argc)
+    if (args.length() < 1)
         return ThrowAndFail(NS_ERROR_XPC_NOT_ENOUGH_ARGS, cx, _retval);
 
     XPCCallContext ccx(JS_CALLER, cx);
@@ -1645,7 +1643,7 @@ nsXPCComponents_ID::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
     JSAutoByteString bytes;
     nsID id;
 
-    if (!(jsstr = JS_ValueToString(cx, argv[0])) ||
+    if (!(jsstr = JS_ValueToString(cx, args[0])) ||
         !bytes.encodeLatin1(cx, jsstr) ||
         !id.Parse(bytes.ptr())) {
         return ThrowAndFail(NS_ERROR_XPC_BAD_ID_STRING, cx, _retval);
@@ -1654,10 +1652,10 @@ nsXPCComponents_ID::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
     // make the new object and return it.
 
     JSObject* newobj = xpc_NewIDObject(cx, obj, id);
+    if (!newobj)
+        return NS_ERROR_UNEXPECTED;
 
-    if (vp)
-        *vp = OBJECT_TO_JSVAL(newobj);
-
+    args.rval().setObject(*newobj);
     return NS_OK;
 }
 
@@ -1696,8 +1694,7 @@ public:
 private:
     static nsresult CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
                                     JSContext *cx, HandleObject obj,
-                                    uint32_t argc, Value *argv,
-                                    Value *vp, bool *_retval);
+                                    const CallArgs &args, bool *_retval);
 };
 
 /***************************************************************************/
@@ -1824,20 +1821,19 @@ NS_IMPL_THREADSAFE_RELEASE(nsXPCComponents_Exception)
 /* bool call (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */
 NS_IMETHODIMP
 nsXPCComponents_Exception::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx, JSObject *objArg,
-                                uint32_t argc, Value *argv, Value *vp, bool *_retval)
+                                const CallArgs &args, bool *_retval)
 {
     RootedObject obj(cx, objArg);
-    return CallOrConstruct(wrapper, cx, obj, argc, argv, vp, _retval);
+    return CallOrConstruct(wrapper, cx, obj, args, _retval);
 }
 
 /* bool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */
 NS_IMETHODIMP
 nsXPCComponents_Exception::Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                                     JSObject *objArg, uint32_t argc, Value *argv, Value *vp,
-                                     bool *_retval)
+                                     JSObject *objArg, const CallArgs &args, bool *_retval)
 {
     RootedObject obj(cx, objArg);
-    return CallOrConstruct(wrapper, cx, obj, argc, argv, vp, _retval);
+    return CallOrConstruct(wrapper, cx, obj, args, _retval);
 }
 
 struct MOZ_STACK_CLASS ExceptionArgParser
@@ -1858,7 +1854,7 @@ struct MOZ_STACK_CLASS ExceptionArgParser
     nsCOMPtr<nsISupports>   eData;
 
     // Parse the constructor arguments into the above |eFoo| parameter values.
-    bool parse(uint32_t argc, JS::Value *argv) {
+    bool parse(const CallArgs &args) {
         /*
          * The Components.Exception takes a series of arguments, all of them
          * optional:
@@ -1880,25 +1876,22 @@ struct MOZ_STACK_CLASS ExceptionArgParser
          *   stack:     Call stack (see argument 2).
          *   data:      User data (see argument 3).
          */
-        if (argc > 0 && !parseMessage(argv[0]))
+        if (args.length() > 0 && !parseMessage(args.handleAt(0)))
             return false;
-        if (argc > 1) {
-            if (argv[1].isObject()) {
-                RootedObject obj(cx, &argv[1].toObject());
+        if (args.length() > 1) {
+            if (args[1].isObject()) {
+                RootedObject obj(cx, &args[1].toObject());
                 return parseOptionsObject(obj);
             }
-            RootedValue v(cx, argv[1]);
-            if (!parseResult(v))
+            if (!parseResult(args.handleAt(1)))
                 return false;
         }
-        if (argc > 2) {
-            RootedValue stack(cx, argv[2]);
-            if (!parseStack(stack))
+        if (args.length() > 2) {
+            if (!parseStack(args.handleAt(2)))
                 return false;
         }
-        if (argc > 3) {
-            RootedValue data(cx, argv[3]);
-            if (!parseData(data))
+        if (args.length() > 3) {
+            if (!parseData(args.handleAt(3)))
                 return false;
         }
         return true;
@@ -1910,7 +1903,7 @@ struct MOZ_STACK_CLASS ExceptionArgParser
      * Parsing helpers.
      */
 
-    bool parseMessage(JS::Value &v) {
+    bool parseMessage(HandleValue v) {
         JSString *str = JS_ValueToString(cx, v);
         if (!str)
            return false;
@@ -1996,8 +1989,7 @@ struct MOZ_STACK_CLASS ExceptionArgParser
 nsresult
 nsXPCComponents_Exception::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
                                            JSContext *cx, HandleObject obj,
-                                           uint32_t argc, Value *argv,
-                                           Value *vp, bool *_retval)
+                                           const CallArgs &args, bool *_retval)
 {
     XPCCallContext ccx(JS_CALLER, cx);
     if (!ccx.IsValid())
@@ -2017,13 +2009,13 @@ nsXPCComponents_Exception::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
     }
 
     // Parse the arguments to the Exception constructor.
-    ExceptionArgParser args(cx, xpc);
-    if (!args.parse(argc, argv))
+    ExceptionArgParser parser(cx, xpc);
+    if (!parser.parse(args))
         return ThrowAndFail(NS_ERROR_XPC_BAD_CONVERT_JS, cx, _retval);
 
     nsCOMPtr<nsIException> e;
-    nsXPCException::NewException(args.eMsg, args.eResult, args.eStack,
-                                 args.eData, getter_AddRefs(e));
+    nsXPCException::NewException(parser.eMsg, parser.eResult, parser.eStack,
+                                 parser.eData, getter_AddRefs(e));
     if (!e)
         return ThrowAndFail(NS_ERROR_XPC_UNEXPECTED, cx, _retval);
 
@@ -2036,9 +2028,7 @@ nsXPCComponents_Exception::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
         return ThrowAndFail(NS_ERROR_XPC_CANT_CREATE_WN, cx, _retval);
     }
 
-    if (vp)
-        *vp = ObjectValue(*newObj);
-
+    args.rval().setObject(*newObj);
     return NS_OK;
 }
 
@@ -2091,8 +2081,7 @@ public:
 private:
     nsresult CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
                              JSContext *cx, HandleObject obj,
-                             uint32_t argc, Value *argv,
-                             Value *vp, bool *_retval);
+                             const CallArgs &args, bool *_retval);
 private:
     nsIJSCID* mClassID;
     nsIJSIID* mInterfaceID;
@@ -2255,27 +2244,26 @@ NS_IMPL_THREADSAFE_RELEASE(nsXPCConstructor)
 /* bool call (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */
 NS_IMETHODIMP
 nsXPCConstructor::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx, JSObject *objArg,
-                       uint32_t argc, Value *argv, Value *vp, bool *_retval)
+                       const CallArgs &args, bool *_retval)
 {
     RootedObject obj(cx, objArg);
-    return CallOrConstruct(wrapper, cx, obj, argc, argv, vp, _retval);
+    return CallOrConstruct(wrapper, cx, obj, args, _retval);
 
 }
 
 /* bool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */
 NS_IMETHODIMP
 nsXPCConstructor::Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx, JSObject *objArg,
-                            uint32_t argc, Value *argv, Value *vp, bool *_retval)
+                            const CallArgs &args, bool *_retval)
 {
     RootedObject obj(cx, objArg);
-    return CallOrConstruct(wrapper, cx, obj, argc, argv, vp, _retval);
+    return CallOrConstruct(wrapper, cx, obj, args, _retval);
 }
 
 // static
 nsresult
 nsXPCConstructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,JSContext *cx,
-                                  HandleObject obj, uint32_t argc, Value *argv, Value *vp,
-                                  bool *_retval)
+                                  HandleObject obj, const CallArgs &args, bool *_retval)
 {
     XPCCallContext ccx(JS_CALLER, cx);
     if (!ccx.IsValid())
@@ -2300,22 +2288,20 @@ nsXPCConstructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,JSContext *
         return ThrowAndFail(NS_ERROR_XPC_CANT_CREATE_WN, cx, _retval);
     }
 
-    Value args[1] = {ObjectValue(*iidObj)};
-    RootedValue val(cx);
-    if (!JS_CallFunctionName(cx, cidObj, "createInstance", 1, args, val.address()) ||
-        val.isPrimitive()) {
+    Value argv[1] = {ObjectValue(*iidObj)};
+    RootedValue rval(cx);
+    if (!JS_CallFunctionName(cx, cidObj, "createInstance", 1, argv, rval.address()) ||
+        rval.isPrimitive()) {
         // createInstance will have thrown an exception
         *_retval = false;
         return NS_OK;
     }
 
-    // root the result
-    if (vp)
-        *vp = val;
+    args.rval().set(rval);
 
     // call initializer method if supplied
     if (mInitializer) {
-        RootedObject newObj(cx, &val.toObject());
+        RootedObject newObj(cx, &rval.toObject());
         // first check existence of function property for better error reporting
         RootedValue fun(cx);
         if (!JS_GetProperty(cx, newObj, mInitializer, fun.address()) ||
@@ -2324,7 +2310,7 @@ nsXPCConstructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,JSContext *
         }
 
         RootedValue dummy(cx);
-        if (!JS_CallFunctionValue(cx, newObj, fun, argc, argv, dummy.address())) {
+        if (!JS_CallFunctionValue(cx, newObj, fun, args.length(), args.array(), dummy.address())) {
             // function should have thrown an exception
             *_retval = false;
             return NS_OK;
@@ -2356,8 +2342,7 @@ public:
 private:
     static nsresult CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
                                     JSContext *cx, HandleObject obj,
-                                    uint32_t argc, Value *argv,
-                                    Value *vp, bool *_retval);
+                                    const CallArgs &args, bool *_retval);
 };
 
 /***************************************************************************/
@@ -2484,33 +2469,30 @@ NS_IMPL_THREADSAFE_RELEASE(nsXPCComponents_Constructor)
 /* bool call (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */
 NS_IMETHODIMP
 nsXPCComponents_Constructor::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                                  JSObject *objArg, uint32_t argc, Value *argv, Value *vp,
-                                  bool *_retval)
+                                  JSObject *objArg, const CallArgs &args, bool *_retval)
 {
     RootedObject obj(cx, objArg);
-    return CallOrConstruct(wrapper, cx, obj, argc, argv, vp, _retval);
+    return CallOrConstruct(wrapper, cx, obj, args, _retval);
 }
 
 /* bool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */
 NS_IMETHODIMP
 nsXPCComponents_Constructor::Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                                       JSObject *objArg, uint32_t argc, Value *argv, Value *vp,
-                                       bool *_retval)
+                                       JSObject *objArg, const CallArgs &args, bool *_retval)
 {
     RootedObject obj(cx, objArg);
-    return CallOrConstruct(wrapper, cx, obj, argc, argv, vp, _retval);
+    return CallOrConstruct(wrapper, cx, obj, args, _retval);
 }
 
 // static
 nsresult
 nsXPCComponents_Constructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
                                              JSContext *cx, HandleObject obj,
-                                             uint32_t argc, jsval * argv,
-                                             jsval * vp, bool *_retval)
+                                             const CallArgs &args, bool *_retval)
 {
     // make sure we have at least one arg
 
-    if (!argc)
+    if (args.length() < 1)
         return ThrowAndFail(NS_ERROR_XPC_NOT_ENOUGH_ARGS, cx, _retval);
 
     // get the various other object pointers we need
@@ -2543,15 +2525,15 @@ nsXPCComponents_Constructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
     const char*        cInitializer = nullptr;
     JSAutoByteString  cInitializerBytes;
 
-    if (argc >= 3) {
-        // argv[2] is an initializer function or property name
-        RootedString str(cx, JS_ValueToString(cx, argv[2]));
+    if (args.length() >= 3) {
+        // args[2] is an initializer function or property name
+        RootedString str(cx, JS_ValueToString(cx, args[2]));
         if (!str || !(cInitializer = cInitializerBytes.encodeLatin1(cx, str)))
             return ThrowAndFail(NS_ERROR_XPC_BAD_CONVERT_JS, cx, _retval);
     }
 
-    if (argc >= 2) {
-        // argv[1] is an iid name string
+    if (args.length() >= 2) {
+        // args[1] is an iid name string
         // XXXjband support passing "Components.interfaces.foo"?
 
         nsCOMPtr<nsIXPCComponents_Interfaces> ifaces;
@@ -2570,7 +2552,7 @@ nsXPCComponents_Constructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
             return ThrowAndFail(NS_ERROR_XPC_UNEXPECTED, cx, _retval);
         }
 
-        RootedString str(cx, JS_ValueToString(cx, argv[1]));
+        RootedString str(cx, JS_ValueToString(cx, args[1]));
         RootedId id(cx);
         if (!str || !JS_ValueToId(cx, StringValue(str), id.address()))
             return ThrowAndFail(NS_ERROR_XPC_BAD_CONVERT_JS, cx, _retval);
@@ -2618,7 +2600,7 @@ nsXPCComponents_Constructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
             return ThrowAndFail(NS_ERROR_XPC_UNEXPECTED, cx, _retval);
         }
 
-        RootedString str(cx, JS_ValueToString(cx, argv[0]));
+        RootedString str(cx, JS_ValueToString(cx, args[0]));
         RootedId id(cx);
         if (!str || !JS_ValueToId(cx, StringValue(str), id.address()))
             return ThrowAndFail(NS_ERROR_XPC_BAD_CONVERT_JS, cx, _retval);
@@ -2650,9 +2632,7 @@ nsXPCComponents_Constructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
         return ThrowAndFail(NS_ERROR_XPC_CANT_CREATE_WN, cx, _retval);
     }
 
-    if (vp)
-        *vp = ObjectValue(*newObj);
-
+    args.rval().setObject(*newObj);
     return NS_OK;
 }
 
@@ -2687,8 +2667,7 @@ public:
 private:
     static nsresult CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
                                     JSContext *cx, HandleObject obj,
-                                    uint32_t argc, Value *argv,
-                                    Value *vp, bool *_retval);
+                                    const CallArgs &args, bool *_retval);
 };
 
 class nsXPCComponents_Utils :
@@ -3476,11 +3455,10 @@ xpc_CreateSandboxObject(JSContext *cx, jsval *vp, nsISupports *prinOrSop, Sandbo
 */
 NS_IMETHODIMP
 nsXPCComponents_utils_Sandbox::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                                    JSObject *objArg, uint32_t argc, Value *argv, Value *vp,
-                                    bool *_retval)
+                                    JSObject *objArg, const CallArgs &args, bool *_retval)
 {
     RootedObject obj(cx, objArg);
-    return CallOrConstruct(wrapper, cx, obj, argc, argv, vp, _retval);
+    return CallOrConstruct(wrapper, cx, obj, args, _retval);
 }
 
 /* bool construct(in nsIXPConnectWrappedNative wrapper,
@@ -3492,11 +3470,10 @@ nsXPCComponents_utils_Sandbox::Call(nsIXPConnectWrappedNative *wrapper, JSContex
 */
 NS_IMETHODIMP
 nsXPCComponents_utils_Sandbox::Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                                         JSObject *objArg, uint32_t argc, Value *argv, Value *vp,
-                                         bool *_retval)
+                                         JSObject *objArg, const CallArgs &args, bool *_retval)
 {
     RootedObject obj(cx, objArg);
-    return CallOrConstruct(wrapper, cx, obj, argc, argv, vp, _retval);
+    return CallOrConstruct(wrapper, cx, obj, args, _retval);
 }
 
 // for sandbox constructor the first argument can be a URI string in which case
@@ -3770,10 +3747,9 @@ AssembleSandboxMemoryReporterName(JSContext *cx, nsCString &sandboxName)
 nsresult
 nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
                                                JSContext *cx, HandleObject obj,
-                                               uint32_t argc, JS::Value *argv,
-                                               jsval *vp, bool *_retval)
+                                               const CallArgs &args, bool *_retval)
 {
-    if (argc < 1)
+    if (args.length() < 1)
         return ThrowAndFail(NS_ERROR_XPC_NOT_ENOUGH_ARGS, cx, _retval);
 
     nsresult rv;
@@ -3783,12 +3759,12 @@ nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrappe
     nsCOMPtr<nsIExpandedPrincipal> expanded;
     nsCOMPtr<nsISupports> prinOrSop;
 
-    if (argv[0].isString()) {
-        RootedString str(cx, argv[0].toString());
+    if (args[0].isString()) {
+        RootedString str(cx, args[0].toString());
         rv = GetPrincipalFromString(cx, str, getter_AddRefs(principal));
         prinOrSop = principal;
-    } else if (argv[0].isObject()) {
-        RootedObject obj(cx, &argv[0].toObject());
+    } else if (args[0].isObject()) {
+        RootedObject obj(cx, &args[0].toObject());
         if (JS_IsArrayObject(cx, obj)) {
             rv = GetExpandedPrincipal(cx, obj, getter_AddRefs(expanded));
             prinOrSop = expanded;
@@ -3804,16 +3780,15 @@ nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrappe
 
     SandboxOptions options(cx);
 
-    if (argc > 1 && argv[1].isObject()) {
-        RootedValue obj(cx, argv[1]);
-        if (NS_FAILED(ParseOptionsObject(cx, obj, options)))
+    if (args.length() > 1 && args[1].isObject()) {
+        if (NS_FAILED(ParseOptionsObject(cx, args.handleAt(1), options)))
             return ThrowAndFail(NS_ERROR_INVALID_ARG, cx, _retval);
     }
 
     if (NS_FAILED(AssembleSandboxMemoryReporterName(cx, options.sandboxName)))
         return ThrowAndFail(NS_ERROR_INVALID_ARG, cx, _retval);
 
-    rv = xpc_CreateSandboxObject(cx, vp, prinOrSop, options);
+    rv = xpc_CreateSandboxObject(cx, args.rval().address(), prinOrSop, options);
 
     if (NS_FAILED(rv))
         return ThrowAndFail(rv, cx, _retval);

js/xpconnect/src/XPCJSID.cpp

@@ -828,8 +828,7 @@ nsJSCID::GetService(const JS::Value& iidval, JSContext* cx,
 NS_IMETHODIMP
 nsJSCID::Construct(nsIXPConnectWrappedNative *wrapper,
                    JSContext * cx, JSObject * objArg,
-                   uint32_t argc, jsval * argv, jsval * vp,
-                   bool *_retval)
+                   const CallArgs &args, bool *_retval)
 {
     RootedObject obj(cx, objArg);
     XPCJSRuntime* rt = nsXPConnect::GetRuntimeInstance();
@@ -838,7 +837,8 @@ nsJSCID::Construct(nsIXPConnectWrappedNative *wrapper,
 
     // 'push' a call context and call on it
     RootedId name(cx, rt->GetStringID(XPCJSRuntime::IDX_CREATE_INSTANCE));
-    XPCCallContext ccx(JS_CALLER, cx, obj, NullPtr(), name, argc, argv, vp);
+    XPCCallContext ccx(JS_CALLER, cx, obj, NullPtr(), name, args.length(), args.array(),
+                       args.rval().address());
 
     *_retval = XPCWrappedNative::CallMethod(ccx);
     return NS_OK;

js/xpconnect/src/XPCWrappedNativeJSOps.cpp

@@ -969,7 +969,7 @@ XPC_WN_Helper_Call(JSContext *cx, unsigned argc, jsval *vp)
 
     SLIM_LOG_WILL_MORPH(cx, obj);
     PRE_HELPER_STUB_NO_SLIM
-    Call(wrapper, cx, obj, args.length(), args.array(), args.rval().address(), &retval);
+    Call(wrapper, cx, obj, args, &retval);
     POST_HELPER_STUB
 }
 
@@ -990,7 +990,7 @@ XPC_WN_Helper_Construct(JSContext *cx, unsigned argc, jsval *vp)
 
     SLIM_LOG_WILL_MORPH(cx, obj);
     PRE_HELPER_STUB_NO_SLIM
-    Construct(wrapper, cx, obj, args.length(), args.array(), args.rval().address(), &retval);
+    Construct(wrapper, cx, obj, args, &retval);
     POST_HELPER_STUB
 }
 

js/xpconnect/wrappers/XrayWrapper.cpp

@@ -1147,7 +1147,7 @@ XPCWrappedNativeXrayTraits::call(JSContext *cx, HandleObject wrapper,
             return false;
         bool ok = true;
         nsresult rv = wn->GetScriptableInfo()->GetCallback()->Call(
-            wn, cx, wrapper, args.length(), args.array(), args.rval().address(), &ok);
+            wn, cx, wrapper, args, &ok);
         if (NS_FAILED(rv)) {
             if (ok)
                 XPCThrower::Throw(rv, cx);
@@ -1173,7 +1173,7 @@ XPCWrappedNativeXrayTraits::construct(JSContext *cx, HandleObject wrapper,
             return false;
         bool ok = true;
         nsresult rv = wn->GetScriptableInfo()->GetCallback()->Construct(
-            wn, cx, wrapper, args.length(), args.array(), args.rval().address(), &ok);
+            wn, cx, wrapper, args, &ok);
         if (NS_FAILED(rv)) {
             if (ok)
                 XPCThrower::Throw(rv, cx);

toolkit/components/ctypes/ctypes.cpp

@@ -115,9 +115,7 @@ NS_IMETHODIMP
 Module::Call(nsIXPConnectWrappedNative* wrapper,
              JSContext* cx,
              JSObject* obj,
-             uint32_t argc,
-             JS::Value* argv,
-             JS::Value* vp,
+             const JS::CallArgs& args,
              bool* _retval)
 {
   mozJSComponentLoader* loader = mozJSComponentLoader::Get();

toolkit/components/perf/PerfMeasurement.cpp

@@ -81,9 +81,7 @@ NS_IMETHODIMP
 Module::Call(nsIXPConnectWrappedNative* wrapper,
              JSContext* cx,
              JSObject* obj,
-             uint32_t argc,
-             JS::Value* argv,
-             JS::Value* vp,
+             const JS::CallArgs& args,
              bool* _retval)
 {
 

toolkit/components/reflect/reflect.cpp

@@ -41,9 +41,7 @@ NS_IMETHODIMP
 Module::Call(nsIXPConnectWrappedNative* wrapper,
              JSContext* cx,
              JSObject* obj,
-             uint32_t argc,
-             JS::Value* argv,
-             JS::Value* vp,
+             const JS::CallArgs& args,
              bool* _retval)
 {
   JSObject* global = JS_GetGlobalForScopeChain(cx);