From a16c67d953926bd9b86359316b983d01825fd0f2 Mon Sep 17 00:00:00 2001
From: Blake Thompson <blake@mapbox.com>
Date: Wed, 26 Jun 2019 13:38:06 -0500
Subject: Fixes problems associated with node 10 and NAN (#14847)

* Fixes problems associated with node 10 and NAN

* Follow up removal of unnecessary linking to map object

* Remove header left over from debugging
---
 platform/node/src/node_request.hpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'platform/node/src/node_request.hpp')

diff --git a/platform/node/src/node_request.hpp b/platform/node/src/node_request.hpp
index 7d7679a3c7..830d262b40 100644
--- a/platform/node/src/node_request.hpp
+++ b/platform/node/src/node_request.hpp
@@ -11,18 +11,19 @@
 
 namespace node_mbgl {
 
-class NodeMap;
+class NodeRequest;
+
+struct NodeAsyncRequest : public mbgl::AsyncRequest {
+    NodeAsyncRequest();
+    ~NodeAsyncRequest() override;
+    NodeRequest* request;
+};
+
+class NodeRequest : public Nan::ObjectWrap {
 
-class NodeRequest : public Nan::ObjectWrap,
-                    public Nan::AsyncWorker {
 public:
-    struct NodeAsyncRequest : public mbgl::AsyncRequest {
-        NodeAsyncRequest(NodeRequest*);
-        ~NodeAsyncRequest() override;
-        NodeRequest* request;
-    };
 
-    NodeRequest(NodeMap*, mbgl::FileSource::Callback);
+    NodeRequest(mbgl::FileSource::Callback, NodeAsyncRequest*);
     ~NodeRequest();
 
     static Nan::Persistent<v8::Function> constructor;
@@ -32,12 +33,11 @@ public:
     static void New(const Nan::FunctionCallbackInfo<v8::Value>&);
     static void HandleCallback(const Nan::FunctionCallbackInfo<v8::Value>&);
 
-    void Execute();
+    void unref();
 
-private:
-    NodeMap* target;
     mbgl::FileSource::Callback callback;
-    NodeAsyncRequest* asyncRequest = nullptr;
+    NodeAsyncRequest* asyncRequest;
+    Nan::AsyncResource* asyncResource = new Nan::AsyncResource("mbgl:execute");
 };
 
 }
-- 
cgit v1.2.1