From cdd8f3ac3235e1d5aab47a6d32c48a0b82a3a1b9 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 17 Apr 2015 09:58:24 -0700
Subject: Separate RequestBase from DefaultFileSource internals

SharedRequestBase was trying to do two different jobs: be a base class
for Asset/HttpRequest and track internal state for DefaultFileSource.

Now we have RequestBase for the former, and DefaultFileRequest for the
latter.
---
 platform/darwin/http_request_nsurl.mm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'platform/darwin')

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;
 }
 
-- 
cgit v1.2.1