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

src/mbgl/annotation/annotation_tile.cpp

@@ -1,7 +1,6 @@
 #include <mbgl/annotation/annotation_tile.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/util/constants.hpp>
-#include <mbgl/storage/file_source.hpp>
 #include <mbgl/renderer/tile_parameters.hpp>
 
 #include <utility>

src/mbgl/map/map_impl.cpp

@@ -73,6 +73,7 @@ void Map::Impl::onUpdate() {
         style->impl->getSourceImpls(),
         style->impl->getLayerImpls(),
         annotationManager,
+        fileSource,
         prefetchZoomDelta,
         bool(stillImageRequest),
         crossSourceCollisions

src/mbgl/renderer/renderer.cpp

@@ -9,12 +9,11 @@ namespace mbgl {
 
 Renderer::Renderer(RendererBackend& backend,
                    float pixelRatio_,
-                   FileSource& fileSource_,
                    Scheduler& scheduler_,
                    GLContextMode contextMode_,
                    const optional<std::string> programCacheDir_,
                    const optional<std::string> localFontFamily_)
-        : impl(std::make_unique<Impl>(backend, pixelRatio_, fileSource_, scheduler_,
+        : impl(std::make_unique<Impl>(backend, pixelRatio_, scheduler_,
                                       contextMode_, std::move(programCacheDir_), std::move(localFontFamily_))) {
 }
 

src/mbgl/renderer/renderer_impl.cpp

@@ -37,14 +37,12 @@ static RendererObserver& nullObserver() {
 
 Renderer::Impl::Impl(RendererBackend& backend_,
                      float pixelRatio_,
-                     FileSource& fileSource_,
                      Scheduler& scheduler_,
                      GLContextMode contextMode_,
                      const optional<std::string> programCacheDir_,
                      const optional<std::string> localFontFamily_)
     : backend(backend_)
     , scheduler(scheduler_)
-    , fileSource(fileSource_)
     , observer(&nullObserver())
     , contextMode(contextMode_)
     , pixelRatio(pixelRatio_)
@@ -78,7 +76,7 @@ void Renderer::Impl::setObserver(RendererObserver* observer_) {
 
 void Renderer::Impl::render(const UpdateParameters& updateParameters) {
     if (!glyphManager) {
-        glyphManager = std::make_unique<GlyphManager>(fileSource, std::make_unique<LocalGlyphRasterizer>(localFontFamily));
+        glyphManager = std::make_unique<GlyphManager>(updateParameters.fileSource, std::make_unique<LocalGlyphRasterizer>(localFontFamily));
         glyphManager->setObserver(this);
     }
 
@@ -118,7 +116,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
         updateParameters.debugOptions,
         updateParameters.transformState,
         scheduler,
-        fileSource,
+        updateParameters.fileSource,
         updateParameters.mode,
         updateParameters.annotationManager,
         *imageManager,

src/mbgl/renderer/renderer_impl.hpp

@@ -27,7 +27,6 @@ class UpdateParameters;
 class RenderStaticData;
 class RenderedQueryOptions;
 class SourceQueryOptions;
-class FileSource;
 class Scheduler;
 class GlyphManager;
 class ImageManager;
@@ -37,7 +36,7 @@ class CrossTileSymbolIndex;
 class Renderer::Impl : public GlyphManagerObserver,
                        public RenderSourceObserver{
 public:
-    Impl(RendererBackend&, float pixelRatio_, FileSource&, Scheduler&, GLContextMode,
+    Impl(RendererBackend&, float pixelRatio_, Scheduler&, GLContextMode,
          const optional<std::string> programCacheDir, const optional<std::string> localFontFamily_);
     ~Impl() final;
 
@@ -91,7 +90,6 @@ private:
 
     RendererBackend& backend;
     Scheduler& scheduler;
-    FileSource& fileSource;
 
     RendererObserver* observer;
 

src/mbgl/renderer/update_parameters.hpp

@@ -14,6 +14,7 @@
 namespace mbgl {
 
 class AnnotationManager;
+class FileSource;
 
 class UpdateParameters {
 public:
@@ -33,6 +34,7 @@ public:
     const Immutable<std::vector<Immutable<style::Layer::Impl>>> layers;
 
     AnnotationManager& annotationManager;
+    FileSource& fileSource;
 
     const uint8_t prefetchZoomDelta;