1 files changed, 23 insertions, 20 deletions

diff --git a/src/text/glyph_store.cpp b/src/text/glyph_store.cpp
index 783710d929..1723bd3d94 100644
--- a/src/text/glyph_store.cpp
+++ b/src/text/glyph_store.cpp
@@ -8,7 +8,7 @@
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/token.hpp>
 #include <mbgl/util/math.hpp>
-#include <mbgl/util/filesource.hpp>
+#include <mbgl/storage/file_source.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/util/uv_detail.hpp>
 #include <algorithm>
@@ -137,7 +137,7 @@ void FontStack::lineWrap(Shaping &shaping, const float lineHeight, const float m
     align(shaping, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, line);
 }
 
-GlyphPBF::GlyphPBF(const std::string &glyphURL, const std::string &fontStack, GlyphRange glyphRange, const std::shared_ptr<FileSource> &fileSource)
+GlyphPBF::GlyphPBF(const std::string &glyphURL, const std::string &fontStack, GlyphRange glyphRange, const util::ptr<FileSource> &fileSource)
     : future(promise.get_future().share())
 {
     // Load the glyph set URL
@@ -147,23 +147,26 @@ GlyphPBF::GlyphPBF(const std::string &glyphURL, const std::string &fontStack, Gl
         return "";
     });
 
-#if defined(DEBUG)
-    fprintf(stderr, "%s\n", url.c_str());
-#endif
-
-    fileSource->load(ResourceType::Glyphs, url, [&](platform::Response *res) {
-        if (res->code != 200) {
-            // Something went wrong with loading the glyph pbf. Pass on the error to the future listeners.
-            const std::string msg = util::sprintf<255>("[ERROR] failed to load glyphs (%d): %s\n", res->code, res->error_message.c_str());
-            promise.set_exception(std::make_exception_ptr(std::runtime_error(msg)));
-        } else {
-            // Transfer the data to the GlyphSet and signal its availability.
-            // Once it is available, the caller will need to call parse() to actually
-            // parse the data we received. We are not doing this here since this callback is being
-            // called from another (unknown) thread.
-            data.swap(res->body);
-            promise.set_value(*this);
-        }
+    // The prepare call jumps back to the main thread.
+    fileSource->prepare([&, url, fileSource] {
+        auto request = fileSource->request(ResourceType::Glyphs, url);
+        request->onload([&, url](const Response &res) {
+            if (res.code != 200) {
+                // Something went wrong with loading the glyph pbf. Pass on the error to the future listeners.
+                const std::string msg = util::sprintf<255>("[ERROR] failed to load glyphs (%d): %s\n", res.code, res.message.c_str());
+                promise.set_exception(std::make_exception_ptr(std::runtime_error(msg)));
+            } else {
+                // Transfer the data to the GlyphSet and signal its availability.
+                // Once it is available, the caller will need to call parse() to actually
+                // parse the data we received. We are not doing this here since this callback is being
+                // called from another (unknown) thread.
+                data = res.data;
+                promise.set_value(*this);
+            }
+        });
+        request->oncancel([&]() {
+            promise.set_exception(std::make_exception_ptr(std::runtime_error("Loading glyphs was canceled")));
+        });
     });
 }
 
@@ -225,7 +228,7 @@ void GlyphPBF::parse(FontStack &stack) {
     data.clear();
 }
 
-GlyphStore::GlyphStore(const std::shared_ptr<FileSource> &fileSource) : fileSource(fileSource) {}
+GlyphStore::GlyphStore(const util::ptr<FileSource> &fileSource) : fileSource(fileSource) {}
 
 void GlyphStore::setURL(const std::string &url) {
     glyphURL = url;