From 0e3a7416e51ced540f14ae955d217551ff3f66a4 Mon Sep 17 00:00:00 2001
From: Asheem Mamoowala <asheem.mamoowala@mapbox.com>
Date: Mon, 19 Aug 2019 00:12:50 -0700
Subject: [core] Don't overwrite locally renderable glyphs with remote glyphs

---
 src/mbgl/text/glyph_manager.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mbgl/text/glyph_manager.cpp b/src/mbgl/text/glyph_manager.cpp
index 990e8be945..35ea1031d5 100644
--- a/src/mbgl/text/glyph_manager.cpp
+++ b/src/mbgl/text/glyph_manager.cpp
@@ -99,8 +99,10 @@ void GlyphManager::processResponse(const Response& res, const FontStack& fontSta
 
         for (auto& glyph : glyphs) {
             auto id = glyph.id;
-            entry.glyphs.erase(id);
-            entry.glyphs.emplace(id, makeMutable<Glyph>(std::move(glyph)));
+            if (!localGlyphRasterizer->canRasterizeGlyph(fontStack, id)) {
+                entry.glyphs.erase(id);
+                entry.glyphs.emplace(id, makeMutable<Glyph>(std::move(glyph)));
+            }
         }
     }
 
-- 
cgit v1.2.1