summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
Diffstat (limited to 'platform')
-rw-r--r--platform/darwin/http_request_nsurl.mm13
-rw-r--r--platform/default/asset_request_fs.cpp11
-rw-r--r--platform/default/asset_request_zip.cpp13
-rw-r--r--platform/default/http_request_curl.cpp13
4 files changed, 13 insertions, 37 deletions
diff --git a/platform/darwin/http_request_nsurl.mm b/platform/darwin/http_request_nsurl.mm
index 24b31ae0a9..07ac16e058 100644
--- a/platform/darwin/http_request_nsurl.mm
+++ b/platform/darwin/http_request_nsurl.mm
@@ -1,5 +1,6 @@
#include <mbgl/storage/http_request.hpp>
#include <mbgl/storage/http_context.hpp>
+#include <mbgl/storage/resource.hpp>
#include <mbgl/storage/response.hpp>
#include <mbgl/util/uv.hpp>
@@ -397,36 +398,28 @@ void HTTPRequestImpl::restart(uv_timer_t *timer, int) {
// -------------------------------------------------------------------------------------------------
-HTTPRequest::HTTPRequest(DefaultFileSource::Impl &source, const Resource &resource)
- : SharedRequestBase(source, resource) {
+HTTPRequest::HTTPRequest(const Resource& resource, Callback callback)
+ : RequestBase(resource, callback) {
}
HTTPRequest::~HTTPRequest() {
- MBGL_VERIFY_THREAD(tid);
-
if (ptr) {
reinterpret_cast<HTTPRequestImpl *>(ptr)->cancel();
}
}
void HTTPRequest::start(uv_loop_t *loop, std::shared_ptr<const Response> response) {
- MBGL_VERIFY_THREAD(tid);
-
assert(!ptr);
ptr = new HTTPRequestImpl(this, loop, response);
}
void HTTPRequest::retryImmediately() {
- MBGL_VERIFY_THREAD(tid);
-
if (ptr) {
reinterpret_cast<HTTPRequestImpl *>(ptr)->retryImmediately();
}
}
void HTTPRequest::cancel() {
- MBGL_VERIFY_THREAD(tid);
-
delete this;
}
diff --git a/platform/default/asset_request_fs.cpp b/platform/default/asset_request_fs.cpp
index 446f2f3d52..9580c2f5bc 100644
--- a/platform/default/asset_request_fs.cpp
+++ b/platform/default/asset_request_fs.cpp
@@ -1,4 +1,5 @@
#include <mbgl/storage/asset_request.hpp>
+#include <mbgl/storage/resource.hpp>
#include <mbgl/storage/response.hpp>
#include <mbgl/util/std.hpp>
#include <mbgl/util/util.hpp>
@@ -207,23 +208,19 @@ void AssetRequestImpl::cleanup(uv_fs_t *req) {
// -------------------------------------------------------------------------------------------------
-AssetRequest::AssetRequest(DefaultFileSource::Impl &source_, const Resource &resource_, const std::string& assetRoot_)
- : SharedRequestBase(source_, resource_)
+AssetRequest::AssetRequest(const Resource& resource_, Callback callback_, const std::string& assetRoot_)
+ : RequestBase(resource_, callback_)
, assetRoot(assetRoot_) {
assert(algo::starts_with(resource.url, "asset://"));
}
AssetRequest::~AssetRequest() {
- MBGL_VERIFY_THREAD(tid);
-
if (ptr) {
reinterpret_cast<AssetRequestImpl *>(ptr)->request = nullptr;
}
}
void AssetRequest::start(uv_loop_t *loop, std::shared_ptr<const Response> response) {
- MBGL_VERIFY_THREAD(tid);
-
// We're ignoring the existing response if any.
(void(response));
@@ -233,8 +230,6 @@ void AssetRequest::start(uv_loop_t *loop, std::shared_ptr<const Response> respon
}
void AssetRequest::cancel() {
- MBGL_VERIFY_THREAD(tid);
-
if (ptr) {
reinterpret_cast<AssetRequestImpl *>(ptr)->canceled = true;
diff --git a/platform/default/asset_request_zip.cpp b/platform/default/asset_request_zip.cpp
index 8a471a4fc4..69de1c742c 100644
--- a/platform/default/asset_request_zip.cpp
+++ b/platform/default/asset_request_zip.cpp
@@ -1,6 +1,7 @@
#include <mbgl/storage/asset_request.hpp>
#include <mbgl/storage/thread_context.hpp>
#include <mbgl/android/jni.hpp>
+#include <mbgl/storage/resource.hpp>
#include <mbgl/storage/response.hpp>
#include <mbgl/platform/log.hpp>
#include <mbgl/util/std.hpp>
@@ -107,7 +108,7 @@ AssetRequestImpl::~AssetRequestImpl() {
MBGL_VERIFY_THREAD(tid);
if (request) {
- request->ptr = nullptr;
+ request->impl = nullptr;
}
}
@@ -274,23 +275,19 @@ void AssetRequestImpl::cancel() {
// -------------------------------------------------------------------------------------------------
-AssetRequest::AssetRequest(DefaultFileSource::Impl &source_, const Resource &resource_, const std::string& assetRoot_)
- : SharedRequestBase(source_, resource_)
+AssetRequest::AssetRequest(const Resource& resource_, Callback callback_, const std::string& assetRoot_)
+ : RequestBase(resource_, callback_)
, assetRoot(assetRoot_) {
assert(algo::starts_with(resource.url, "asset://"));
}
AssetRequest::~AssetRequest() {
- MBGL_VERIFY_THREAD(tid);
-
if (ptr) {
reinterpret_cast<AssetRequestImpl *>(ptr)->cancel();
}
}
void AssetRequest::start(uv_loop_t *loop, std::shared_ptr<const Response> response) {
- MBGL_VERIFY_THREAD(tid);
-
// We're ignoring the existing response if any.
(void(response));
@@ -300,8 +297,6 @@ void AssetRequest::start(uv_loop_t *loop, std::shared_ptr<const Response> respon
}
void AssetRequest::cancel() {
- MBGL_VERIFY_THREAD(tid);
-
if (ptr) {
reinterpret_cast<AssetRequestImpl *>(ptr)->cancel();
}
diff --git a/platform/default/http_request_curl.cpp b/platform/default/http_request_curl.cpp
index a5de61104a..ffe3b525ab 100644
--- a/platform/default/http_request_curl.cpp
+++ b/platform/default/http_request_curl.cpp
@@ -1,5 +1,6 @@
#include <mbgl/storage/http_request.hpp>
#include <mbgl/storage/http_context.hpp>
+#include <mbgl/storage/resource.hpp>
#include <mbgl/storage/response.hpp>
#include <mbgl/util/chrono.hpp>
#include <mbgl/platform/log.hpp>
@@ -722,36 +723,28 @@ void HTTPRequestImpl::handleResult(CURLcode code) {
// -------------------------------------------------------------------------------------------------
-HTTPRequest::HTTPRequest(DefaultFileSource::Impl &source_, const Resource &resource_)
- : SharedRequestBase(source_, resource_) {
+HTTPRequest::HTTPRequest(const Resource& resource_, Callback callback_)
+ : RequestBase(resource_, callback_) {
}
HTTPRequest::~HTTPRequest() {
- MBGL_VERIFY_THREAD(tid);
-
if (ptr) {
reinterpret_cast<HTTPRequestImpl *>(ptr)->abandon();
}
}
void HTTPRequest::start(uv_loop_t *loop, std::shared_ptr<const Response> response) {
- MBGL_VERIFY_THREAD(tid);
-
assert(!ptr);
ptr = new HTTPRequestImpl(this, loop, response);
}
void HTTPRequest::retryImmediately() {
- MBGL_VERIFY_THREAD(tid);
-
if (ptr) {
reinterpret_cast<HTTPRequestImpl *>(ptr)->retryImmediately();
}
}
void HTTPRequest::cancel() {
- MBGL_VERIFY_THREAD(tid);
-
if (ptr) {
delete reinterpret_cast<HTTPRequestImpl *>(ptr);
ptr = nullptr;
View Lorry Controller Status