function: Use JS::CallArgs throughout invocation call chain

If you have a JSObject for the 'this' object, a JS::Value array for the
arguments, and a mutable JS::Value for the return value, then that's
basically a JS::CallArgs.

The only difference is that when calling a constructor, you may not be
able to get the 'this' object from args.computeThis(). For
gjs_invoke_constructor_from_c(), we need to provide the 'this' object
that was provided to the constructor.

1 files changed, 2 insertions, 8 deletions

diff --git a/gi/fundamental.h b/gi/fundamental.h
index a1a9f363..a26461eb 100644
--- a/gi/fundamental.h
+++ b/gi/fundamental.h
@@ -30,8 +30,6 @@
 #include <girepository.h>
 #include <glib-object.h>
 
-#include <js/Id.h>
-#include <js/RootingAPI.h>
 #include <js/TypeDecls.h>
 
 #include "gi/wrapperutils.h"
@@ -40,10 +38,7 @@
 
 class FundamentalPrototype;
 class FundamentalInstance;
-namespace JS {
-class CallArgs;
-class HandleValueArray;
-}  // namespace JS
+namespace JS { class CallArgs; }
 
 /* To conserve memory, we have two different kinds of private data for JS
  * wrappers for fundamental types: FundamentalInstance, and
@@ -158,8 +153,7 @@ class FundamentalInstance
 
     GJS_JSAPI_RETURN_CONVENTION
     bool invoke_constructor(JSContext* cx, JS::HandleObject obj,
-                            const JS::HandleValueArray& args,
-                            GIArgument* rvalue);
+                            const JS::CallArgs& args, GIArgument* rvalue);
 
     void ref(void) { get_prototype()->call_ref_function(m_ptr); }
     void unref(void) { get_prototype()->call_unref_function(m_ptr); }