diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-05-07 19:57:12 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-05-13 13:54:16 -0700 |
commit | 386be7c0faf20220f1e25b1a29f478519d1e2aa9 (patch) | |
tree | 1ed1c4f6f8007111bda59c32c974cfb47c71ec8c /src | |
parent | 1d38b636402a6581c491185090f5c81495a07d13 (diff) | |
download | qtlocation-mapboxgl-386be7c0faf20220f1e25b1a29f478519d1e2aa9.tar.gz |
Remove unused
There are no longer any requests made that don't have a run loop to
dispatch back to.
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/map/environment.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/storage/default_file_source.cpp | 12 |
2 files changed, 1 insertions, 16 deletions
diff --git a/src/mbgl/map/environment.cpp b/src/mbgl/map/environment.cpp index 5857d4bdf6..327efeecff 100644 --- a/src/mbgl/map/environment.cpp +++ b/src/mbgl/map/environment.cpp @@ -121,11 +121,6 @@ unsigned Environment::getID() const { return id; } -void Environment::requestAsync(const Resource& resource, - std::function<void(const Response&)> callback) { - fileSource.request(resource, std::move(callback)); -} - Request* Environment::request(const Resource& resource, std::function<void(const Response&)> callback) { return fileSource.request(resource, util::RunLoop::current.get()->get(), std::move(callback)); diff --git a/src/mbgl/storage/default_file_source.cpp b/src/mbgl/storage/default_file_source.cpp index cc7475d2f3..e8831f5465 100644 --- a/src/mbgl/storage/default_file_source.cpp +++ b/src/mbgl/storage/default_file_source.cpp @@ -37,24 +37,14 @@ DefaultFileSource::~DefaultFileSource() { Request* DefaultFileSource::request(const Resource& resource, uv_loop_t* l, Callback callback) { + assert(l); auto req = new Request(resource, l, std::move(callback)); - - // This function can be called from any thread. Make sure we're executing the actual call in the - // file source loop by sending it over the queue. thread->invoke(&Impl::add, req); - return req; } -void DefaultFileSource::request(const Resource& resource, Callback callback) { - request(resource, nullptr, std::move(callback)); -} - void DefaultFileSource::cancel(Request *req) { req->cancel(); - - // This function can be called from any thread. Make sure we're executing the actual call in the - // file source loop by sending it over the queue. thread->invoke(&Impl::cancel, req); } |