5 files changed, 13 insertions, 13 deletions
diff --git a/src/mbgl/style/sources/custom_geometry_source.cpp b/src/mbgl/style/sources/custom_geometry_source.cpp
index 6e9d8d65fb..546feacb8f 100644
--- a/src/mbgl/style/sources/custom_geometry_source.cpp
+++ b/src/mbgl/style/sources/custom_geometry_source.cpp
@@ -22,7 +22,7 @@ const CustomGeometrySource::Impl& CustomGeometrySource::impl() const {
     return static_cast<const CustomGeometrySource::Impl&>(*baseImpl);
 }
 
-void CustomGeometrySource::loadDescription(FileSource&) {
+void CustomGeometrySource::loadDescription(std::shared_ptr<FileSource>) {
     baseImpl = makeMutable<CustomGeometrySource::Impl>(impl(), loader->self());
     loaded = true;
 }
diff --git a/src/mbgl/style/sources/geojson_source.cpp b/src/mbgl/style/sources/geojson_source.cpp
index 4e3478322d..cb83b75ec7 100644
--- a/src/mbgl/style/sources/geojson_source.cpp
+++ b/src/mbgl/style/sources/geojson_source.cpp
@@ -40,7 +40,7 @@ optional<std::string> GeoJSONSource::getURL() const {
     return url;
 }
 
-void GeoJSONSource::loadDescription(FileSource& fileSource) {
+void GeoJSONSource::loadDescription(std::shared_ptr<FileSource> fileSource) {
     if (!url) {
         loaded = true;
         return;
@@ -50,7 +50,7 @@ void GeoJSONSource::loadDescription(FileSource& fileSource) {
         return;
     }
 
-    req = fileSource.request(Resource::source(*url), [this](Response res) {
+    req = fileSource->request(Resource::source(*url), [this](Response res) {
         if (res.error) {
             observer->onSourceError(
                 *this, std::make_exception_ptr(std::runtime_error(res.error->message)));
diff --git a/src/mbgl/style/sources/image_source.cpp b/src/mbgl/style/sources/image_source.cpp
index fa268da0ef..da046ba882 100644
--- a/src/mbgl/style/sources/image_source.cpp
+++ b/src/mbgl/style/sources/image_source.cpp
@@ -51,7 +51,7 @@ optional<std::string> ImageSource::getURL() const {
     return url;
 }
 
-void ImageSource::loadDescription(FileSource& fileSource) {
+void ImageSource::loadDescription(std::shared_ptr<FileSource> fileSource) {
     if (!url) {
         loaded = true;
     }
@@ -61,7 +61,7 @@ void ImageSource::loadDescription(FileSource& fileSource) {
     }
     const Resource imageResource { Resource::Image, *url, {} };
 
-    req = fileSource.request(imageResource, [this](Response res) {
+    req = fileSource->request(imageResource, [this](Response res) {
         if (res.error) {
             observer->onSourceError(*this, std::make_exception_ptr(std::runtime_error(res.error->message)));
         } else if (res.notModified) {
diff --git a/src/mbgl/style/sources/raster_source.cpp b/src/mbgl/style/sources/raster_source.cpp
index c2f96dbd55..5faa6a0335 100644
--- a/src/mbgl/style/sources/raster_source.cpp
+++ b/src/mbgl/style/sources/raster_source.cpp
@@ -11,8 +11,8 @@ namespace mbgl {
 namespace style {
 
 RasterSource::RasterSource(std::string id, variant<std::string, Tileset> urlOrTileset_, uint16_t tileSize, SourceType sourceType)
-    : Source(makeMutable<Impl>(sourceType, std::move(id), tileSize)),
-      urlOrTileset(std::move(urlOrTileset_)) {
+    : Source(makeMutable<Impl>(sourceType, std::move(id), tileSize))
+    , urlOrTileset(std::move(urlOrTileset_)) {
 }
 
 RasterSource::~RasterSource() = default;
@@ -37,7 +37,7 @@ uint16_t RasterSource::getTileSize() const {
     return impl().getTileSize();
 }
 
-void RasterSource::loadDescription(FileSource& fileSource) {
+void RasterSource::loadDescription(std::shared_ptr<FileSource> fileSource) {
     if (urlOrTileset.is<Tileset>()) {
         baseImpl = makeMutable<Impl>(impl(), urlOrTileset.get<Tileset>());
         loaded = true;
@@ -49,7 +49,7 @@ void RasterSource::loadDescription(FileSource& fileSource) {
     }
 
     const std::string& url = urlOrTileset.get<std::string>();
-    req = fileSource.request(Resource::source(url), [this, url](Response res) {
+    req = fileSource->request(Resource::source(url), [this, url](Response res) {
         if (res.error) {
             observer->onSourceError(*this, std::make_exception_ptr(std::runtime_error(res.error->message)));
         } else if (res.notModified) {
diff --git a/src/mbgl/style/sources/vector_source.cpp b/src/mbgl/style/sources/vector_source.cpp
index 6cede8fae9..b0152974da 100644
--- a/src/mbgl/style/sources/vector_source.cpp
+++ b/src/mbgl/style/sources/vector_source.cpp
@@ -12,8 +12,8 @@ namespace mbgl {
 namespace style {
 
 VectorSource::VectorSource(std::string id, variant<std::string, Tileset> urlOrTileset_)
-    : Source(makeMutable<Impl>(std::move(id))),
-      urlOrTileset(std::move(urlOrTileset_)) {
+    : Source(makeMutable<Impl>(std::move(id)))
+    , urlOrTileset(std::move(urlOrTileset_)) {
 }
 
 VectorSource::~VectorSource() = default;
@@ -34,7 +34,7 @@ optional<std::string> VectorSource::getURL() const {
     return urlOrTileset.get<std::string>();
 }
 
-void VectorSource::loadDescription(FileSource& fileSource) {
+void VectorSource::loadDescription(std::shared_ptr<FileSource> fileSource) {
     if (urlOrTileset.is<Tileset>()) {
         baseImpl = makeMutable<Impl>(impl(), urlOrTileset.get<Tileset>());
         loaded = true;
@@ -46,7 +46,7 @@ void VectorSource::loadDescription(FileSource& fileSource) {
     }
 
     const std::string& url = urlOrTileset.get<std::string>();
-    req = fileSource.request(Resource::source(url), [this, url](Response res) {
+    req = fileSource->request(Resource::source(url), [this, url](Response res) {
         if (res.error) {
             observer->onSourceError(*this, std::make_exception_ptr(std::runtime_error(res.error->message)));
         } else if (res.notModified) {