[core] Per-bucket glyph atlases

1 files changed, 3 insertions, 5 deletions

diff --git a/src/mbgl/tile/geometry_tile_worker.hpp b/src/mbgl/tile/geometry_tile_worker.hpp
index 3a15763a82..c07c16dd9b 100644
--- a/src/mbgl/tile/geometry_tile_worker.hpp
+++ b/src/mbgl/tile/geometry_tile_worker.hpp
@@ -17,9 +17,7 @@ namespace mbgl {
 
 class GeometryTile;
 class GeometryTileData;
-class GlyphAtlas;
 class SymbolLayout;
-class RenderLayer;
 
 namespace style {
 class Layer;
@@ -39,7 +37,7 @@ public:
     void setData(std::unique_ptr<const GeometryTileData>, uint64_t correlationID);
     void setPlacementConfig(PlacementConfig, uint64_t correlationID);
     
-    void onGlyphsAvailable(GlyphPositionMap glyphs);
+    void onGlyphsAvailable(GlyphMap glyphs);
     void onIconsAvailable(IconMap icons);
 
 private:
@@ -82,8 +80,8 @@ private:
     std::vector<std::unique_ptr<SymbolLayout>> symbolLayouts;
     GlyphDependencies pendingGlyphDependencies;
     IconDependencies pendingIconDependencies;
-    GlyphPositionMap glyphPositions;
-    IconMap icons;
+    GlyphMap glyphMap;
+    IconMap iconMap;
 };
 
 } // namespace mbgl