The v8impl::Reference class is now separated into ReferenceWithFinalizer class

See nodejs@431ac16

Author: Xmader

src/js_native_api_v8.cc

@@ -331,15 +331,15 @@ inline napi_status ConcludeDeferred(napi_env env,
 }
 
 #if 1
-class ArrayBufferReference final : public Reference {
+class ArrayBufferReference final : public ReferenceWithFinalizer {
  public:
   // Same signatures for ctor and New() as Reference, except this only works
   // with ArrayBuffers:
   template <typename... Args>
   explicit ArrayBufferReference(napi_env env,
                                 v8::Local<v8::ArrayBuffer> value,
                                 Args&&... args)
-    : Reference(env, value, std::forward<Args>(args)...),
+    : ReferenceWithFinalizer(env, value, std::forward<Args>(args)...),
       _env(env) {}
 
   template <typename... Args>
@@ -352,7 +352,7 @@ class ArrayBufferReference final : public Reference {
  private:
   napi_env _env;
 
-  inline void Finalize() override {
+  inline void CallUserFinalizer() override {
     v8::HandleScope handle_scope(_env->isolate);
     v8::Local<v8::Value> obj = Get(_env);
     CHECK(!obj.IsEmpty());
@@ -361,7 +361,7 @@ class ArrayBufferReference final : public Reference {
     if (ab->IsDetachable())
       ab->Detach();
 
-    Reference::Finalize();
+    ReferenceWithFinalizer::CallUserFinalizer();
   }
 };
 #endif
@@ -390,7 +390,7 @@ inline napi_status Unwrap(napi_env env,
   v8::Local<v8::Value> val = obj->GetInternalField(0).As<v8::Value>();
 #else
   v8::Local<v8::Value> val = obj->GetPrivate(context, NAPI_PRIVATE_KEY(context, wrapper))
-                                 .ToLocalChecked();
+                 .ToLocalChecked();
 #endif
   RETURN_STATUS_IF_FALSE(env, val->IsExternal(), napi_invalid_arg);
   Reference* reference =

src/js_native_api_v8.h

@@ -417,11 +417,11 @@ class Reference : public RefTracker {
             ReferenceOwnership ownership);
   virtual void CallUserFinalizer() {}
   virtual void InvokeFinalizerFromGC();
-  void Finalize() override;
 
  private:
   static void WeakCallback(const v8::WeakCallbackInfo<Reference>& data);
   void SetWeak();
+  void Finalize() override;
 
  private:
   v8impl::Persistent<v8::Value> persistent_;
@@ -453,7 +453,7 @@ class ReferenceWithData final : public Reference {
 };
 
 // Reference that has a user finalizer callback.
-class ReferenceWithFinalizer final : public Reference {
+class ReferenceWithFinalizer : public Reference {
  public:
   static ReferenceWithFinalizer* New(napi_env env,
                                      v8::Local<v8::Value> value,
@@ -467,7 +467,7 @@ class ReferenceWithFinalizer final : public Reference {
   void ResetFinalizer() override { finalizer_.ResetFinalizer(); }
   void* Data() override { return finalizer_.data(); }
 
- private:
+ protected:
   ReferenceWithFinalizer(napi_env env,
                          v8::Local<v8::Value> value,
                          uint32_t initial_refcount,