1 files changed, 14 insertions, 12 deletions
diff --git a/src/mbgl/tile/geometry_tile_worker.hpp b/src/mbgl/tile/geometry_tile_worker.hpp
index 1df1ef43c4..194477e7b8 100644
--- a/src/mbgl/tile/geometry_tile_worker.hpp
+++ b/src/mbgl/tile/geometry_tile_worker.hpp
@@ -2,11 +2,13 @@
 
 #include <mbgl/map/mode.hpp>
 #include <mbgl/tile/tile_id.hpp>
-#include <mbgl/sprite/sprite_atlas.hpp>
+#include <mbgl/style/image_impl.hpp>
 #include <mbgl/text/glyph.hpp>
 #include <mbgl/text/placement_config.hpp>
 #include <mbgl/actor/actor_ref.hpp>
 #include <mbgl/util/optional.hpp>
+#include <mbgl/util/immutable.hpp>
+#include <mbgl/style/layer_impl.hpp>
 
 #include <atomic>
 #include <memory>
@@ -15,9 +17,7 @@ namespace mbgl {
 
 class GeometryTile;
 class GeometryTileData;
-class GlyphAtlas;
 class SymbolLayout;
-class RenderLayer;
 
 namespace style {
 class Layer;
@@ -29,15 +29,16 @@ public:
                        ActorRef<GeometryTile> parent,
                        OverscaledTileID,
                        const std::atomic<bool>&,
-                       const MapMode);
+                       const MapMode,
+                       const float pixelRatio);
     ~GeometryTileWorker();
 
-    void setLayers(std::vector<std::unique_ptr<style::Layer>>, uint64_t correlationID);
+    void setLayers(std::vector<Immutable<style::Layer::Impl>>, uint64_t correlationID);
     void setData(std::unique_ptr<const GeometryTileData>, uint64_t correlationID);
     void setPlacementConfig(PlacementConfig, uint64_t correlationID);
     
-    void onGlyphsAvailable(GlyphPositionMap glyphs);
-    void onIconsAvailable(IconMap icons);
+    void onGlyphsAvailable(GlyphMap glyphs);
+    void onImagesAvailable(ImageMap images);
 
 private:
     void coalesced();
@@ -47,7 +48,7 @@ private:
     void coalesce();
 
     void requestNewGlyphs(const GlyphDependencies&);
-    void requestNewIcons(const IconDependencies&);
+    void requestNewImages(const ImageDependencies&);
    
     void symbolDependenciesChanged();
     bool hasPendingSymbolDependencies() const;
@@ -59,6 +60,7 @@ private:
     const OverscaledTileID id;
     const std::atomic<bool>& obsolete;
     const MapMode mode;
+    const float pixelRatio;
 
     enum State {
         Idle,
@@ -71,15 +73,15 @@ private:
     uint64_t correlationID = 0;
 
     // Outer optional indicates whether we've received it or not.
-    optional<std::vector<std::unique_ptr<style::Layer>>> layers;
+    optional<std::vector<Immutable<style::Layer::Impl>>> layers;
     optional<std::unique_ptr<const GeometryTileData>> data;
     optional<PlacementConfig> placementConfig;
 
     std::vector<std::unique_ptr<SymbolLayout>> symbolLayouts;
     GlyphDependencies pendingGlyphDependencies;
-    IconDependencies pendingIconDependencies;
-    GlyphPositionMap glyphPositions;
-    IconMap icons;
+    ImageDependencies pendingImageDependencies;
+    GlyphMap glyphMap;
+    ImageMap imageMap;
 };
 
 } // namespace mbgl