diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-19 14:25:59 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-19 14:33:55 -0700 |
commit | 270cfa2ede60e91b9b851267d01a232578a8198f (patch) | |
tree | 852106f8239c0551a1cd306a05db681ff8d2ac09 | |
parent | 2cdbb49a0c7253aa38da8e02dff921d78dc2de49 (diff) | |
download | qtlocation-mapboxgl-270cfa2ede60e91b9b851267d01a232578a8198f.tar.gz |
Partially revert "[node] Fix memory test hanging after GlyphAtlas refactoring (#8394)"
This reverts commit 5700c99e553c6e487649350505f438844056a1c8.
-rw-r--r-- | platform/node/src/node_request.cpp | 10 | ||||
-rw-r--r-- | platform/node/src/node_request.hpp | 6 |
2 files changed, 0 insertions, 16 deletions
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<v8::Value>& inf } void NodeRequest::Execute() { - asyncExecute = std::make_unique<mbgl::util::AsyncTask>([this] { doExecute(); Unref(); }); - asyncExecute->send(); - - Ref(); -} - -void NodeRequest::doExecute() { - Nan::HandleScope scope; - v8::Local<v8::Value> argv[] = { handle() }; Nan::MakeCallback(Nan::To<v8::Object>(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 <mbgl/storage/resource.hpp> #include <mbgl/storage/file_source.hpp> -#include <mbgl/util/async_task.hpp> - -#include <memory> 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<mbgl::util::AsyncTask> asyncExecute; }; } |