[core] FontStack ⇢ GlyphSet (#4803)

A font stack is an array of font names. This is not that.

2 files changed, 3 insertions, 5 deletions

diff --git a/src/mbgl/geometry/glyph_atlas.cpp b/src/mbgl/geometry/glyph_atlas.cpp
index 046ba46520..92fc7903b2 100644
--- a/src/mbgl/geometry/glyph_atlas.cpp
+++ b/src/mbgl/geometry/glyph_atlas.cpp
@@ -1,7 +1,5 @@
 #include <mbgl/geometry/glyph_atlas.hpp>
 
-#include <mbgl/text/font_stack.hpp>
-
 #include <mbgl/gl/gl.hpp>
 #include <mbgl/gl/gl_object_store.hpp>
 #include <mbgl/platform/log.hpp>
@@ -27,12 +25,12 @@ GlyphAtlas::~GlyphAtlas() {
 void GlyphAtlas::addGlyphs(uintptr_t tileUID,
                            const std::u32string& text,
                            const std::string& stackName,
-                           const FontStack& fontStack,
+                           const GlyphSet& glyphSet,
                            GlyphPositions& face)
 {
     std::lock_guard<std::mutex> lock(mtx);
 
-    const std::map<uint32_t, SDFGlyph>& sdfs = fontStack.getSDFs();
+    const std::map<uint32_t, SDFGlyph>& sdfs = glyphSet.getSDFs();
 
     for (uint32_t chr : text)
     {
diff --git a/src/mbgl/geometry/glyph_atlas.hpp b/src/mbgl/geometry/glyph_atlas.hpp
index 2758ac7cee..9b8af9f75d 100644
--- a/src/mbgl/geometry/glyph_atlas.hpp
+++ b/src/mbgl/geometry/glyph_atlas.hpp
@@ -23,7 +23,7 @@ public:
     void addGlyphs(uintptr_t tileUID,
                    const std::u32string& text,
                    const std::string& stackName,
-                   const FontStack&,
+                   const GlyphSet&,
                    GlyphPositions&);
     void removeGlyphs(uintptr_t tileUID);