Delete StreamDecode/StreamEncode in Destructors

Author: nstepien

src/common/stream_coder.cc

@@ -1,11 +1,5 @@
 #include "stream_coder.h"
 
-StreamCoder::StreamCoder() {
-}
-
-StreamCoder::~StreamCoder() {
-}
-
 void StreamCoder::ClearPendingOutput(napi_env env) {
   size_t n_chunks = pending_output.size();
   for (size_t i = 0; i < n_chunks; i++) {

src/common/stream_coder.h

@@ -12,9 +12,6 @@ class StreamCoder {
 
     void ClearPendingOutput(napi_env env);
     void PendingChunksAsArray(napi_env env, napi_value* arr);
-  protected:
-    explicit StreamCoder();
-    ~StreamCoder();
 };
 
 #endif

src/dec/stream_decode.cc

@@ -7,15 +7,11 @@ StreamDecode::StreamDecode(napi_env env) {
   alloc.ReportMemoryToV8(env);
 }
 
-StreamDecode::~StreamDecode() {
-  napi_delete_reference(env_, wrapper_);
-  BrotliDecoderDestroyInstance(state);
-}
-
 void StreamDecode::Destructor(napi_env env, void* nativeObject, void* /*finalize_hint*/) {
   StreamDecode* obj = reinterpret_cast<StreamDecode*>(nativeObject);
-  obj->~StreamDecode();
+  BrotliDecoderDestroyInstance(obj->state);
   obj->ClearPendingOutput(env);
+  delete obj;
 }
 
 napi_value StreamDecode::Init(napi_env env, napi_value exports) {
@@ -39,13 +35,12 @@ napi_value StreamDecode::New(napi_env env, napi_callback_info info) {
 
   StreamDecode* obj = new StreamDecode(env);
 
-  obj->env_ = env;
   napi_wrap(env,
             jsthis,
             reinterpret_cast<void*>(obj),
             StreamDecode::Destructor,
             nullptr,
-            &obj->wrapper_);
+            nullptr);
 
   return jsthis;
 }

src/dec/stream_decode.h

@@ -21,14 +21,11 @@ class StreamDecode : public StreamCoder {
 
   private:
     explicit StreamDecode(napi_env env);
-    ~StreamDecode();
 
     static napi_value New(napi_env env, napi_callback_info info);
     static napi_value Transform(napi_env env, napi_callback_info info);
     static napi_value Flush(napi_env env, napi_callback_info info);
     static napi_ref constructor;
-    napi_env env_;
-    napi_ref wrapper_;
 };
 
 #endif

src/enc/stream_encode.cc

@@ -18,15 +18,11 @@ StreamEncode::StreamEncode(napi_env env, napi_value params) {
   alloc.ReportMemoryToV8(env);
 }
 
-StreamEncode::~StreamEncode() {
-  napi_delete_reference(env_, wrapper_);
-  BrotliEncoderDestroyInstance(state);
-}
-
 void StreamEncode::Destructor(napi_env env, void* nativeObject, void* /*finalize_hint*/) {
   StreamEncode* obj = reinterpret_cast<StreamEncode*>(nativeObject);
-  obj->~StreamEncode();
+  BrotliEncoderDestroyInstance(obj->state);
   obj->ClearPendingOutput(env);
+  delete obj;
 }
 
 void StreamEncode::SetParameter(napi_env env, napi_value params, const char* key, BrotliEncoderParameter p) {
@@ -77,13 +73,12 @@ napi_value StreamEncode::New(napi_env env, napi_callback_info info) {
 
   StreamEncode* obj = new StreamEncode(env, argv[0]);
 
-  obj->env_ = env;
   napi_wrap(env,
             jsthis,
             reinterpret_cast<void*>(obj),
             StreamEncode::Destructor,
             nullptr,
-            &obj->wrapper_);
+            nullptr);
 
   return jsthis;
 }

src/enc/stream_encode.h

@@ -22,15 +22,12 @@ class StreamEncode : public StreamCoder {
 
   private:
     explicit StreamEncode(napi_env env, napi_value params);
-    ~StreamEncode();
     void SetParameter(napi_env env, napi_value params, const char* key, BrotliEncoderParameter p);
 
     static napi_value New(napi_env env, napi_callback_info info);
     static napi_value Transform(napi_env env, napi_callback_info info);
     static napi_value Flush(napi_env env, napi_callback_info info);
     static napi_ref constructor;
-    napi_env env_;
-    napi_ref wrapper_;
 };
 
 #endif