diff options
Diffstat (limited to 'platform/node/src')
-rw-r--r-- | platform/node/src/node_map.cpp | 13 | ||||
-rw-r--r-- | platform/node/src/node_map.hpp | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp index 5eefe402d6..953e485fe9 100644 --- a/platform/node/src/node_map.cpp +++ b/platform/node/src/node_map.cpp @@ -474,17 +474,10 @@ NodeMap::~NodeMap() { if (valid) release(); } -class NodeFileSourceRequest : public mbgl::FileRequest { -public: - std::unique_ptr<mbgl::WorkRequest> workRequest; -}; - -std::unique_ptr<mbgl::FileRequest> NodeMap::request(const mbgl::Resource& resource, Callback cb1) { - auto req = std::make_unique<NodeFileSourceRequest>(); - +std::unique_ptr<mbgl::AsyncRequest> NodeMap::request(const mbgl::Resource& resource, Callback cb1) { // This function can be called from any thread. Make sure we're executing the // JS implementation in the node event loop. - req->workRequest = NodeRunLoop().invokeWithCallback([this] (mbgl::Resource res, Callback cb2) { + return NodeRunLoop().invokeWithCallback([this] (mbgl::Resource res, Callback cb2) { Nan::HandleScope scope; auto requestHandle = NodeRequest::Create(res, cb2)->ToObject(); @@ -493,8 +486,6 @@ std::unique_ptr<mbgl::FileRequest> NodeMap::request(const mbgl::Resource& resour v8::Local<v8::Value> argv[] = { requestHandle, callbackHandle }; Nan::MakeCallback(handle()->GetInternalField(1)->ToObject(), "request", 2, argv); }, cb1, resource); - - return std::move(req); } } diff --git a/platform/node/src/node_map.hpp b/platform/node/src/node_map.hpp index fe36ae7ed0..ac01c9b3a7 100644 --- a/platform/node/src/node_map.hpp +++ b/platform/node/src/node_map.hpp @@ -42,7 +42,7 @@ public: NodeMap(v8::Local<v8::Object>); ~NodeMap(); - std::unique_ptr<mbgl::FileRequest> request(const mbgl::Resource&, Callback); + std::unique_ptr<mbgl::AsyncRequest> request(const mbgl::Resource&, Callback); mbgl::HeadlessView view; std::unique_ptr<mbgl::Map> map; |