From 7b39ce95210ceb6640b3a3399dacd1d0e826ac1f Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 18 Feb 2016 10:48:51 -0800 Subject: [PATCH] [core] Remove ThreadContext::getFileSource; instead thread FileSource through --- src/mbgl/map/map_context.cpp | 11 +++++----- src/mbgl/map/map_context.hpp | 1 + src/mbgl/source/source.cpp | 11 ++++------ src/mbgl/source/source.hpp | 3 ++- src/mbgl/sprite/sprite_store.cpp | 8 +++----- src/mbgl/sprite/sprite_store.hpp | 4 +++- src/mbgl/style/style.cpp | 12 +++++++---- src/mbgl/style/style.hpp | 4 +++- src/mbgl/style/style_update_parameters.hpp | 4 ++++ src/mbgl/text/glyph_pbf.cpp | 7 +++---- src/mbgl/text/glyph_pbf.hpp | 4 +++- src/mbgl/text/glyph_store.cpp | 7 +++++-- src/mbgl/text/glyph_store.hpp | 4 +++- src/mbgl/tile/raster_tile_data.cpp | 3 ++- src/mbgl/tile/raster_tile_data.hpp | 2 ++ src/mbgl/tile/vector_tile.cpp | 8 ++++---- src/mbgl/tile/vector_tile.hpp | 4 +++- src/mbgl/util/thread_context.cpp | 16 --------------- src/mbgl/util/thread_context.hpp | 4 ---- test/sprite/sprite_store.cpp | 6 +----- test/style/glyph_store.cpp | 3 +-- test/style/source.cpp | 24 +++++++++++----------- test/style/style.cpp | 9 ++++++-- 23 files changed, 79 insertions(+), 80 deletions(-) diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp index d9a7f4712..a4c6abdb2 100644 --- a/src/mbgl/map/map_context.cpp +++ b/src/mbgl/map/map_context.cpp @@ -28,8 +28,9 @@ namespace mbgl { -MapContext::MapContext(View& view_, FileSource& fileSource, MapMode mode_, GLContextMode contextMode_, const float pixelRatio_) +MapContext::MapContext(View& view_, FileSource& fileSource_, MapMode mode_, GLContextMode contextMode_, const float pixelRatio_) : view(view_), + fileSource(fileSource_), dataPtr(std::make_unique(mode_, contextMode_, pixelRatio_)), data(*dataPtr), asyncUpdate([this] { update(); }), @@ -37,7 +38,6 @@ MapContext::MapContext(View& view_, FileSource& fileSource, MapMode mode_, GLCon texturePool(std::make_unique()) { assert(util::ThreadContext::currentlyOn(util::ThreadType::Map)); - util::ThreadContext::setFileSource(&fileSource); util::ThreadContext::setGLObjectStore(&glObjectStore); view.activate(); @@ -96,7 +96,7 @@ void MapContext::setStyleURL(const std::string& url) { styleURL = url; styleJSON.clear(); - style = std::make_unique