diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-08-12 13:40:53 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-08-24 13:06:23 -0700 |
| commit | d05486391a75de8dace7aec258121a92a3e698fb (patch) | |
| tree | 3ee1fcd45de4d1c0dc7d823a7a728394cc94a3e5 | |
| parent | 079ddfc8e4a107d0801e84c0fd2f6118e1a501fc (diff) | |
| download | qtlocation-mapboxgl-d05486391a75de8dace7aec258121a92a3e698fb.tar.gz | |
[core] Remove unnecessary members from UpdateParameters
| -rw-r--r-- | src/mbgl/map/map.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/renderer/renderer_impl.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/renderer/update_parameters.hpp | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index d5a5923e6c..b7978f0e9b 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -709,8 +709,6 @@ void Map::Impl::onUpdate(Update flags) { style->impl->getImageImpls(), style->impl->getSourceImpls(), style->impl->getLayerImpls(), - scheduler, - fileSource, annotationManager, prefetchZoomDelta, bool(stillImageRequest) diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index 38b296b389..0e1e621770 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -94,8 +94,8 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { updateParameters.pixelRatio, updateParameters.debugOptions, updateParameters.transformState, - updateParameters.scheduler, - updateParameters.fileSource, + scheduler, + fileSource, updateParameters.mode, updateParameters.annotationManager, *imageManager, diff --git a/src/mbgl/renderer/update_parameters.hpp b/src/mbgl/renderer/update_parameters.hpp index 181b11784d..b54abc050d 100644 --- a/src/mbgl/renderer/update_parameters.hpp +++ b/src/mbgl/renderer/update_parameters.hpp @@ -13,8 +13,6 @@ namespace mbgl { -class Scheduler; -class FileSource; class AnnotationManager; class UpdateParameters { @@ -34,8 +32,6 @@ public: const Immutable<std::vector<Immutable<style::Source::Impl>>> sources; const Immutable<std::vector<Immutable<style::Layer::Impl>>> layers; - Scheduler& scheduler; - FileSource& fileSource; AnnotationManager& annotationManager; const uint8_t prefetchZoomDelta; |