Revert "Move atlas ownership to Style"

This reverts commit bffee0715458530c6c86f440f757a4de667278a2.

1 files changed, 14 insertions, 0 deletions

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 5d8b66ab1d..44a560a468 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -23,6 +23,7 @@
 namespace mbgl {
 
 class Painter;
+class GlyphStore;
 class LayerDescription;
 class Sprite;
 class Style;
@@ -32,6 +33,9 @@ class StyleSource;
 class TexturePool;
 class FileSource;
 class View;
+class GlyphAtlas;
+class SpriteAtlas;
+class LineAtlas;
 class Environment;
 
 class Map : private util::noncopyable {
@@ -149,6 +153,7 @@ private:
     void resize(uint16_t width, uint16_t height, float ratio = 1);
     void resize(uint16_t width, uint16_t height, float ratio, uint16_t fbWidth, uint16_t fbHeight);
 
+    util::ptr<Sprite> getSprite();
     uv::worker& getWorker();
 
     // Checks if render thread needs to pause
@@ -158,6 +163,8 @@ private:
     void setup();
 
     void updateTiles();
+    void updateSources();
+    void updateSources(const util::ptr<StyleLayerGroup> &group);
 
     // Prepares a map render by updating the tiles we need for the current view, as well as updating
     // the stylesheet.
@@ -206,6 +213,11 @@ private:
     FileSource& fileSource;
 
     util::ptr<Style> style;
+    const std::unique_ptr<GlyphAtlas> glyphAtlas;
+    util::ptr<GlyphStore> glyphStore;
+    const std::unique_ptr<SpriteAtlas> spriteAtlas;
+    util::ptr<Sprite> sprite;
+    const std::unique_ptr<LineAtlas> lineAtlas;
     util::ptr<TexturePool> texturePool;
 
     const std::unique_ptr<Painter> painter;
@@ -219,6 +231,8 @@ private:
 
     bool debug = false;
     std::chrono::steady_clock::time_point animationTime = std::chrono::steady_clock::time_point::min();
+
+    std::set<util::ptr<StyleSource>> activeSources;
 };
 
 }