diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-10-21 17:08:59 -0700 |
---|---|---|
committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-12-01 00:00:09 +0200 |
commit | 0d8ea6c0a238a3b76d4ac49dee89f8e62769b8fe (patch) | |
tree | eaed65e560be14d66ec7da75f2c2732d37ec17c1 /platform/default/asset_request_fs.cpp | |
parent | d422c8cac4e436fb2fb1eeafbae5ed5d847e0b00 (diff) | |
download | qtlocation-mapboxgl-0d8ea6c0a238a3b76d4ac49dee89f8e62769b8fe.tar.gz |
[core] Removed dependency on uv_loop from the file source
Diffstat (limited to 'platform/default/asset_request_fs.cpp')
-rw-r--r-- | platform/default/asset_request_fs.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/platform/default/asset_request_fs.cpp b/platform/default/asset_request_fs.cpp index 955f8d8020..e86b8bd8d1 100644 --- a/platform/default/asset_request_fs.cpp +++ b/platform/default/asset_request_fs.cpp @@ -1,6 +1,7 @@ #include <mbgl/storage/asset_context_base.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> +#include <mbgl/util/run_loop.hpp> #include <mbgl/util/util.hpp> #include <mbgl/util/url.hpp> #include <mbgl/util/uv.hpp> @@ -17,7 +18,7 @@ class AssetRequest : public RequestBase { MBGL_STORE_THREAD(tid) public: - AssetRequest(const Resource&, Callback, uv_loop_t*, const std::string& assetRoot); + AssetRequest(const Resource&, Callback, const std::string& assetRoot); ~AssetRequest(); void cancel() final; @@ -40,9 +41,8 @@ public: class AssetFSContext : public AssetContextBase { RequestBase* createRequest(const Resource& resource, RequestBase::Callback callback, - uv_loop_t* loop, const std::string& assetRoot) final { - return new AssetRequest(resource, callback, loop, assetRoot); + return new AssetRequest(resource, callback, assetRoot); } }; @@ -50,7 +50,7 @@ AssetRequest::~AssetRequest() { MBGL_VERIFY_THREAD(tid); } -AssetRequest::AssetRequest(const Resource& resource_, Callback callback_, uv_loop_t* loop, const std::string& assetRoot_) +AssetRequest::AssetRequest(const Resource& resource_, Callback callback_, const std::string& assetRoot_) : RequestBase(resource_, callback_), assetRoot(assetRoot_) { req.data = this; @@ -65,6 +65,7 @@ AssetRequest::AssetRequest(const Resource& resource_, Callback callback_, uv_loo path = assetRoot + "/" + mbgl::util::percentDecode(url.substr(8)); } + auto loop = static_cast<uv_loop_t*>(util::RunLoop::getLoopHandle()); uv_fs_open(loop, &req, path.c_str(), O_RDONLY, S_IRUSR, fileOpened); } @@ -217,7 +218,7 @@ void AssetRequest::cancel() { uv_cancel((uv_req_t *)&req); } -std::unique_ptr<AssetContextBase> AssetContextBase::createContext(uv_loop_t*) { +std::unique_ptr<AssetContextBase> AssetContextBase::createContext() { return std::make_unique<AssetFSContext>(); } |