Eliminate Map::getGlyphStore()

4 files changed, 10 insertions, 7 deletions

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 635ac4d222..fca3619c0c 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -127,7 +127,6 @@ public:
 public:
     inline const TransformState &getState() const { return state; }
     inline util::ptr<Style> getStyle() const { return style; }
-    inline util::ptr<GlyphStore> getGlyphStore() { return glyphStore; }
     util::ptr<Sprite> getSprite();
     inline util::ptr<Texturepool> getTexturepool() { return texturepool; }
     uv::worker &getWorker();
diff --git a/include/mbgl/map/source.hpp b/include/mbgl/map/source.hpp
index 2094ff0828..b515d26f0a 100644
--- a/include/mbgl/map/source.hpp
+++ b/include/mbgl/map/source.hpp
@@ -19,6 +19,7 @@ namespace mbgl {
 
 class Map;
 class GlyphAtlas;
+class GlyphStore;
 class SpriteAtlas;
 class FileSource;
 class Painter;
@@ -31,7 +32,7 @@ public:
     Source(const util::ptr<SourceInfo>& info);
 
     void load(Map&, FileSource&);
-    bool update(Map&, GlyphAtlas&, SpriteAtlas&, FileSource&);
+    bool update(Map&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&);
 
     void updateMatrices(const mat4 &projMatrix, const TransformState &transform);
     void drawClippingMasks(Painter &painter);
@@ -50,9 +51,9 @@ private:
     int32_t coveringZoomLevel(const TransformState&) const;
     std::forward_list<Tile::ID> coveringTiles(const TransformState&) const;
 
-    bool updateTiles(Map&, GlyphAtlas&, SpriteAtlas&, FileSource&);
+    bool updateTiles(Map&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&);
 
-    TileData::State addTile(Map&, GlyphAtlas&, SpriteAtlas&, FileSource&, const Tile::ID&);
+    TileData::State addTile(Map&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&, const Tile::ID&);
     TileData::State hasTile(const Tile::ID& id);
 
     double getZoom(const TransformState &state) const;
diff --git a/include/mbgl/map/tile_parser.hpp b/include/mbgl/map/tile_parser.hpp
index 576c18ec94..5e8aa4fc36 100644
--- a/include/mbgl/map/tile_parser.hpp
+++ b/include/mbgl/map/tile_parser.hpp
@@ -35,7 +35,7 @@ public:
     TileParser(const std::string &data, VectorTileData &tile,
                const util::ptr<const Style> &style,
                GlyphAtlas & glyphAtlas,
-               const util::ptr<GlyphStore> &glyphStore,
+               GlyphStore & glyphStore,
                SpriteAtlas & spriteAtlas,
                const util::ptr<Sprite> &sprite);
     ~TileParser();
@@ -62,7 +62,7 @@ private:
     // Cross-thread shared data.
     util::ptr<const Style> style;
     GlyphAtlas & glyphAtlas;
-    util::ptr<GlyphStore> glyphStore;
+    GlyphStore & glyphStore;
     SpriteAtlas & spriteAtlas;
     util::ptr<Sprite> sprite;
     util::ptr<Texturepool> texturePool;
diff --git a/include/mbgl/map/vector_tile_data.hpp b/include/mbgl/map/vector_tile_data.hpp
index 793aa61581..59846fcaae 100644
--- a/include/mbgl/map/vector_tile_data.hpp
+++ b/include/mbgl/map/vector_tile_data.hpp
@@ -22,6 +22,7 @@ class SourceInfo;
 class StyleLayer;
 class TileParser;
 class GlyphAtlas;
+class GlyphStore;
 class SpriteAtlas;
 
 class VectorTileData : public TileData {
@@ -29,7 +30,8 @@ class VectorTileData : public TileData {
 
 public:
     VectorTileData(Tile::ID const&, Map&,
-                   GlyphAtlas&, SpriteAtlas&,
+                   GlyphAtlas&, GlyphStore&,
+                   SpriteAtlas&,
                    const util::ptr<SourceInfo>&);
     ~VectorTileData();
 
@@ -53,6 +55,7 @@ protected:
     std::unordered_map<std::string, std::unique_ptr<Bucket>> buckets;
 
     GlyphAtlas& glyphAtlas;
+    GlyphStore& glyphStore;
     SpriteAtlas& spriteAtlas;
 
 public: