diff --git a/include/mbgl/storage/request.hpp b/include/mbgl/storage/request.hpp index a01808ce8..5d979a281 100644 --- a/include/mbgl/storage/request.hpp +++ b/include/mbgl/storage/request.hpp @@ -19,8 +19,6 @@ namespace mbgl { class Response; class Request : private util::noncopyable { - MBGL_STORE_THREAD(tid) - public: using Callback = std::function; Request(const Resource &resource, uv_loop_t *loop, Callback callback); diff --git a/src/mbgl/map/environment.cpp b/src/mbgl/map/environment.cpp index dd6c1f193..5857d4bdf 100644 --- a/src/mbgl/map/environment.cpp +++ b/src/mbgl/map/environment.cpp @@ -128,7 +128,6 @@ void Environment::requestAsync(const Resource& resource, Request* Environment::request(const Resource& resource, std::function callback) { - assert(currentlyOn(ThreadType::Map)); return fileSource.request(resource, util::RunLoop::current.get()->get(), std::move(callback)); } diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp index 4e0a04472..2352e09c2 100644 --- a/src/mbgl/map/map_context.cpp +++ b/src/mbgl/map/map_context.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include @@ -62,8 +61,8 @@ MapContext::~MapContext() { // Explicit resets currently necessary because these abandon resources that need to be // cleaned up by env.performCleanup(); + resourceLoader.reset(); style.reset(); - sprite.reset(); painter.reset(); texturePool.reset(); lineAtlas.reset(); @@ -124,24 +123,10 @@ void MapContext::setStyleJSON(const std::string& json, const std::string& base) loadStyleJSON(json, base); } -util::ptr MapContext::getSprite() { - assert(Environment::currentlyOn(ThreadType::Map)); - const float pixelRatio = transformState.getPixelRatio(); - const std::string &sprite_url = style->getSpriteURL(); - if (!sprite || !sprite->hasPixelRatio(pixelRatio)) { - sprite = std::make_shared(sprite_url, pixelRatio, env, [this] { - assert(Environment::currentlyOn(ThreadType::Map)); - triggerUpdate(); - }); - } - - return sprite; -} - void MapContext::loadStyleJSON(const std::string& json, const std::string& base) { assert(Environment::currentlyOn(ThreadType::Map)); - sprite.reset(); + resourceLoader.reset(); style.reset(); style = util::make_unique