From 9d22ac82811899ed4e806c1941f2a5695e414612 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 19 Jul 2017 14:25:59 -0700 Subject: Partially revert "[node] Fix memory test hanging after GlyphAtlas refactoring (#8394)" This reverts commit 5700c99e553c6e487649350505f438844056a1c8. --- platform/node/src/node_request.cpp | 10 ---------- platform/node/src/node_request.hpp | 6 ------ 2 files changed, 16 deletions(-) (limited to 'platform') diff --git a/platform/node/src/node_request.cpp b/platform/node/src/node_request.cpp index 09373b1779..de16710f78 100644 --- a/platform/node/src/node_request.cpp +++ b/platform/node/src/node_request.cpp @@ -122,19 +122,9 @@ void NodeRequest::HandleCallback(const Nan::FunctionCallbackInfo& inf } void NodeRequest::Execute() { - asyncExecute = std::make_unique([this] { doExecute(); Unref(); }); - asyncExecute->send(); - - Ref(); -} - -void NodeRequest::doExecute() { - Nan::HandleScope scope; - v8::Local argv[] = { handle() }; Nan::MakeCallback(Nan::To(target->handle()->GetInternalField(1)).ToLocalChecked(), "request", 1, argv); - asyncExecute.reset(); } NodeRequest::NodeAsyncRequest::NodeAsyncRequest(NodeRequest* request_) : request(request_) { diff --git a/platform/node/src/node_request.hpp b/platform/node/src/node_request.hpp index 356566132b..7d7679a3c7 100644 --- a/platform/node/src/node_request.hpp +++ b/platform/node/src/node_request.hpp @@ -8,9 +8,6 @@ #include #include -#include - -#include namespace node_mbgl { @@ -38,12 +35,9 @@ public: void Execute(); private: - void doExecute(); - NodeMap* target; mbgl::FileSource::Callback callback; NodeAsyncRequest* asyncRequest = nullptr; - std::unique_ptr asyncExecute; }; } -- cgit v1.2.1