From 9af3b033bf41cd32635172864d58dc169168f9e6 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 25 Nov 2014 16:31:30 -0800
Subject: Eliminate Map::getStyle()

---
 include/mbgl/map/map.hpp              | 1 -
 include/mbgl/map/source.hpp           | 4 ++++
 include/mbgl/map/vector_tile_data.hpp | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'include/mbgl')

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 7ce2bb7020..3f53902b19 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -126,7 +126,6 @@ public:
 
 public:
     inline const TransformState &getState() const { return state; }
-    inline util::ptr<Style> getStyle() const { return style; }
     inline timestamp getAnimationTime() const { return animationTime; }
     inline timestamp getTime() const { return animationTime; }
     void updateTiles();
diff --git a/include/mbgl/map/source.hpp b/include/mbgl/map/source.hpp
index 0eefe1ad5d..8de02735c6 100644
--- a/include/mbgl/map/source.hpp
+++ b/include/mbgl/map/source.hpp
@@ -24,6 +24,7 @@ class SpriteAtlas;
 class Sprite;
 class FileSource;
 class Texturepool;
+class Style;
 class Painter;
 class StyleLayer;
 class TransformState;
@@ -35,6 +36,7 @@ public:
 
     void load(Map&, FileSource&);
     bool update(Map&, uv::worker&,
+                util::ptr<Style>,
                 GlyphAtlas&, GlyphStore&,
                 SpriteAtlas&, util::ptr<Sprite>,
                 Texturepool&, FileSource&);
@@ -57,11 +59,13 @@ private:
     std::forward_list<Tile::ID> coveringTiles(const TransformState&) const;
 
     bool updateTiles(Map&, uv::worker&,
+                     util::ptr<Style>,
                      GlyphAtlas&, GlyphStore&,
                      SpriteAtlas&, util::ptr<Sprite>,
                      Texturepool&, FileSource&);
 
     TileData::State addTile(Map&, uv::worker&,
+                            util::ptr<Style>,
                             GlyphAtlas&, GlyphStore&,
                             SpriteAtlas&, util::ptr<Sprite>,
                             FileSource&, Texturepool&,
diff --git a/include/mbgl/map/vector_tile_data.hpp b/include/mbgl/map/vector_tile_data.hpp
index ee2d63a2b2..9fa9e4c84f 100644
--- a/include/mbgl/map/vector_tile_data.hpp
+++ b/include/mbgl/map/vector_tile_data.hpp
@@ -26,12 +26,14 @@ class GlyphStore;
 class SpriteAtlas;
 class Sprite;
 class Texturepool;
+class Style;
 
 class VectorTileData : public TileData {
     friend class TileParser;
 
 public:
     VectorTileData(Tile::ID const&, Map&,
+                   util::ptr<Style>,
                    GlyphAtlas&, GlyphStore&,
                    SpriteAtlas&, util::ptr<Sprite>,
                    Texturepool&,
@@ -62,6 +64,7 @@ protected:
     SpriteAtlas& spriteAtlas;
     util::ptr<Sprite> sprite;
     Texturepool& texturepool;
+    util::ptr<Style> style;
 
 public:
     const float depth;
-- 
cgit v1.2.1