diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-23 17:31:14 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-24 10:54:32 -0700 |
commit | 169755e89a72b103fab100ccd101013e8eef1481 (patch) | |
tree | 5716e13519fe2b7f5c91cccbdbf14635a1ef117d /platform/default/mbgl/storage | |
parent | 7ff074889e826f766028ba582beb677b39d16bec (diff) | |
download | qtlocation-mapboxgl-169755e89a72b103fab100ccd101013e8eef1481.tar.gz |
[core] Unify FileRequest and WorkRequest
Diffstat (limited to 'platform/default/mbgl/storage')
-rw-r--r-- | platform/default/mbgl/storage/offline_download.cpp | 11 | ||||
-rw-r--r-- | platform/default/mbgl/storage/offline_download.hpp | 6 |
2 files changed, 7 insertions, 10 deletions
diff --git a/platform/default/mbgl/storage/offline_download.cpp b/platform/default/mbgl/storage/offline_download.cpp index 36b6f5d502..0dcffbd9cb 100644 --- a/platform/default/mbgl/storage/offline_download.cpp +++ b/platform/default/mbgl/storage/offline_download.cpp @@ -196,8 +196,7 @@ void OfflineDownload::activateDownload() { } void OfflineDownload::deactivateDownload() { - workRequests.clear(); - fileRequests.clear(); + requests.clear(); } void OfflineDownload::ensureTiles(SourceType type, uint16_t tileSize, const SourceInfo& info) { @@ -209,9 +208,9 @@ void OfflineDownload::ensureTiles(SourceType type, uint16_t tileSize, const Sour void OfflineDownload::ensureResource(const Resource& resource, std::function<void (Response)> callback) { status.requiredResourceCount++; - auto workRequestsIt = workRequests.insert(workRequests.begin(), nullptr); + auto workRequestsIt = requests.insert(requests.begin(), nullptr); *workRequestsIt = util::RunLoop::Get()->invokeCancellable([=] () { - workRequests.erase(workRequestsIt); + requests.erase(workRequestsIt); optional<std::pair<Response, uint64_t>> offlineResponse = offlineDatabase.getRegionResource(id, resource); if (offlineResponse) { @@ -238,14 +237,14 @@ void OfflineDownload::ensureResource(const Resource& resource, std::function<voi return; } - auto fileRequestsIt = fileRequests.insert(fileRequests.begin(), nullptr); + auto fileRequestsIt = requests.insert(requests.begin(), nullptr); *fileRequestsIt = onlineFileSource.request(resource, [=] (Response onlineResponse) { if (onlineResponse.error) { observer->responseError(*onlineResponse.error); return; } - fileRequests.erase(fileRequestsIt); + requests.erase(fileRequestsIt); if (callback) { callback(onlineResponse); diff --git a/platform/default/mbgl/storage/offline_download.hpp b/platform/default/mbgl/storage/offline_download.hpp index d5ba801540..70c486d945 100644 --- a/platform/default/mbgl/storage/offline_download.hpp +++ b/platform/default/mbgl/storage/offline_download.hpp @@ -11,8 +11,7 @@ namespace mbgl { class OfflineDatabase; class FileSource; -class WorkRequest; -class FileRequest; +class AsyncRequest; class Resource; class Response; class SourceInfo; @@ -56,8 +55,7 @@ private: FileSource& onlineFileSource; OfflineRegionStatus status; std::unique_ptr<OfflineRegionObserver> observer; - std::list<std::unique_ptr<WorkRequest>> workRequests; - std::list<std::unique_ptr<FileRequest>> fileRequests; + std::list<std::unique_ptr<AsyncRequest>> requests; std::set<std::string> requiredSourceURLs; }; |