[core] Get FileSource via UpdateParameters in Renderer::Impl

11 files changed, 15 insertions, 15 deletions

diff --git a/test/api/annotations.test.cpp b/test/api/annotations.test.cpp
index a81d9ff990..89ce357d84 100644
--- a/test/api/annotations.test.cpp
+++ b/test/api/annotations.test.cpp
@@ -31,7 +31,7 @@ public:
     StubFileSource fileSource;
     ThreadPool threadPool { 4 };
     float pixelRatio { 1 };
-    HeadlessFrontend frontend { pixelRatio, fileSource, threadPool };
+    HeadlessFrontend frontend { pixelRatio, threadPool };
 
     Map map { frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, fileSource,
               threadPool, MapOptions().withMapMode(MapMode::Static)};
diff --git a/test/api/api_misuse.test.cpp b/test/api/api_misuse.test.cpp
index 8899173071..2ccfb0a7ff 100644
--- a/test/api/api_misuse.test.cpp
+++ b/test/api/api_misuse.test.cpp
@@ -25,7 +25,7 @@ TEST(API, RenderWithoutCallback) {
     StubFileSource fileSource;
     ThreadPool threadPool(4);
     float pixelRatio { 1 };
-    HeadlessFrontend frontend { pixelRatio, fileSource, threadPool };
+    HeadlessFrontend frontend { pixelRatio, threadPool };
 
     auto map = std::make_unique<Map>(frontend, MapObserver::nullObserver(), frontend.getSize(),
                                      pixelRatio, fileSource, threadPool,
diff --git a/test/api/custom_geometry_source.test.cpp b/test/api/custom_geometry_source.test.cpp
index 4eeca9104b..6959a36f15 100644
--- a/test/api/custom_geometry_source.test.cpp
+++ b/test/api/custom_geometry_source.test.cpp
@@ -23,7 +23,7 @@ TEST(CustomGeometrySource, Grid) {
     DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
     auto threadPool = sharedThreadPool();
     float pixelRatio { 1 };
-    HeadlessFrontend frontend { pixelRatio, fileSource, *threadPool };
+    HeadlessFrontend frontend { pixelRatio, *threadPool };
     Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, fileSource,
             *threadPool, MapOptions().withMapMode(MapMode::Static));
     map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json"));
diff --git a/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp
index d840925206..18c6dc1692 100644
--- a/test/api/custom_layer.test.cpp
+++ b/test/api/custom_layer.test.cpp
@@ -93,7 +93,7 @@ TEST(CustomLayer, Basic) {
     DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
     ThreadPool threadPool(4);
     float pixelRatio { 1 };
-    HeadlessFrontend frontend { pixelRatio, fileSource, threadPool };
+    HeadlessFrontend frontend { pixelRatio, threadPool };
     Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, fileSource,
             threadPool, MapOptions().withMapMode(MapMode::Static));
     map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json"));
diff --git a/test/api/query.test.cpp b/test/api/query.test.cpp
index b9fc3a4a62..5567eabc73 100644
--- a/test/api/query.test.cpp
+++ b/test/api/query.test.cpp
@@ -36,7 +36,7 @@ public:
     StubFileSource fileSource;
     ThreadPool threadPool { 4 };
     float pixelRatio { 1 };
-    HeadlessFrontend frontend { pixelRatio, fileSource, threadPool };
+    HeadlessFrontend frontend { pixelRatio, threadPool };
     Map map { frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, fileSource,
               threadPool, MapOptions().withMapMode(MapMode::Static)};
 };
diff --git a/test/api/recycle_map.cpp b/test/api/recycle_map.cpp
index 0883241274..db576b4cf6 100644
--- a/test/api/recycle_map.cpp
+++ b/test/api/recycle_map.cpp
@@ -28,7 +28,7 @@ TEST(API, RecycleMapUpdateImages) {
     ThreadPool threadPool(4);
     float pixelRatio { 1 };
 
-    HeadlessFrontend frontend { pixelRatio, fileSource, threadPool };
+    HeadlessFrontend frontend { pixelRatio, threadPool };
     auto map = std::make_unique<Map>(frontend, MapObserver::nullObserver(), frontend.getSize(),
                                      pixelRatio, fileSource, threadPool,
                                      MapOptions().withMapMode(MapMode::Static));
diff --git a/test/gl/context.test.cpp b/test/gl/context.test.cpp
index f260555f55..3c055c2ce0 100644
--- a/test/gl/context.test.cpp
+++ b/test/gl/context.test.cpp
@@ -90,7 +90,7 @@ TEST(GLContextMode, Shared) {
     ThreadPool threadPool(4);
     float pixelRatio { 1 };
 
-    HeadlessFrontend frontend { pixelRatio, fileSource, threadPool, {}, GLContextMode::Shared };
+    HeadlessFrontend frontend { pixelRatio, threadPool, {}, GLContextMode::Shared };
 
     Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio,
             fileSource, threadPool, MapOptions().withMapMode(MapMode::Static));
diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp
index f45c728944..0197202a9d 100644
--- a/test/map/map.test.cpp
+++ b/test/map/map.test.cpp
@@ -38,7 +38,7 @@ public:
     Map map;
 
     MapTest(float pixelRatio = 1, MapMode mode = MapMode::Static)
-        : frontend(pixelRatio, fileSource, threadPool)
+        : frontend(pixelRatio, threadPool)
         , map(frontend, observer, frontend.getSize(), pixelRatio,
               fileSource, threadPool, MapOptions().withMapMode(mode)) {
     }
@@ -48,7 +48,7 @@ public:
             float pixelRatio = 1, MapMode mode = MapMode::Static,
             typename std::enable_if<std::is_same<T, DefaultFileSource>::value>::type* = 0)
             : fileSource { cachePath, assetRoot }
-            , frontend(pixelRatio, fileSource, threadPool)
+            , frontend(pixelRatio, threadPool)
             , map(frontend, observer, frontend.getSize(), pixelRatio,
                   fileSource, threadPool, MapOptions().withMapMode(mode)) {
     }
@@ -685,7 +685,7 @@ TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) {
 
     util::Timer timer;
 
-    HeadlessFrontend frontend(pixelRatio, fileSource, threadPool);
+    HeadlessFrontend frontend(pixelRatio, threadPool);
 
     StubMapObserver observer;
     observer.didFinishRenderingFrameCallback = [&] (MapObserver::RenderMode) {
diff --git a/test/map/prefetch.test.cpp b/test/map/prefetch.test.cpp
index 9b7d620739..dfde3a779b 100644
--- a/test/map/prefetch.test.cpp
+++ b/test/map/prefetch.test.cpp
@@ -37,7 +37,7 @@ TEST(Map, PrefetchTiles) {
         runLoop.stop();
     };
 
-    HeadlessFrontend frontend { { 512, 512 }, 1, fileSource, threadPool };
+    HeadlessFrontend frontend { { 512, 512 }, 1, threadPool };
     Map map(frontend, observer, frontend.getSize(), 1, fileSource, threadPool,
             MapOptions().withMapMode(MapMode::Continuous));
 
diff --git a/test/text/local_glyph_rasterizer.test.cpp b/test/text/local_glyph_rasterizer.test.cpp
index 20f825c935..d0fdb5ee57 100644
--- a/test/text/local_glyph_rasterizer.test.cpp
+++ b/test/text/local_glyph_rasterizer.test.cpp
@@ -33,7 +33,7 @@ namespace {
 class LocalGlyphRasterizerTest {
 public:
     LocalGlyphRasterizerTest(const optional<std::string> fontFamily)
-        : frontend(pixelRatio, fileSource, threadPool, optional<std::string>(), GLContextMode::Unique, fontFamily)
+        : frontend(pixelRatio, threadPool, optional<std::string>(), GLContextMode::Unique, fontFamily)
     {
     }
 
diff --git a/test/util/memory.test.cpp b/test/util/memory.test.cpp
index a0e64a6704..36bed57ab5 100644
--- a/test/util/memory.test.cpp
+++ b/test/util/memory.test.cpp
@@ -71,7 +71,7 @@ TEST(Memory, Vector) {
     MemoryTest test;
     float ratio { 2 };
 
-    HeadlessFrontend frontend { { 256, 256 }, ratio, test.fileSource, test.threadPool };
+    HeadlessFrontend frontend { { 256, 256 }, ratio, test.threadPool };
     Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), ratio, test.fileSource,
             test.threadPool, MapOptions().withMapMode(MapMode::Static));
     map.jumpTo(CameraOptions().withZoom(16));
@@ -84,7 +84,7 @@ TEST(Memory, Raster) {
     MemoryTest test;
     float ratio { 2 };
 
-    HeadlessFrontend frontend { { 256, 256 }, ratio, test.fileSource, test.threadPool };
+    HeadlessFrontend frontend { { 256, 256 }, ratio, test.threadPool };
     Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), ratio, test.fileSource,
             test.threadPool, MapOptions().withMapMode(MapMode::Static));
     map.getStyle().loadURL("mapbox://satellite");
@@ -122,7 +122,7 @@ TEST(Memory, Footprint) {
     class FrontendAndMap {
     public:
         FrontendAndMap(MemoryTest& test_, const char* style)
-            : frontend(Size{ 256, 256 }, 2, test_.fileSource, test_.threadPool)
+            : frontend(Size{ 256, 256 }, 2, test_.threadPool)
             , map(frontend, MapObserver::nullObserver(), frontend.getSize(), 2, test_.fileSource
             , test_.threadPool, MapOptions().withMapMode(MapMode::Static)) {
             map.jumpTo(CameraOptions().withZoom(16));