From 4eb54270d773bf60f948176c3ff7827d7f818a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Mon, 5 Sep 2016 19:04:34 +0200 Subject: [PATCH] [core] remove unused TimePoint during Source update --- src/mbgl/map/map.cpp | 1 - src/mbgl/style/source_impl.cpp | 2 -- src/mbgl/style/source_impl.hpp | 3 --- src/mbgl/style/update_parameters.hpp | 3 --- test/style/source.cpp | 1 - 5 files changed, 10 deletions(-) diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index cb3a1fefc..5c58893b5 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -227,7 +227,6 @@ void Map::Impl::update() { style::UpdateParameters parameters(pixelRatio, debugOptions, - timePoint, transform.getState(), style->workers, fileSource, diff --git a/src/mbgl/style/source_impl.cpp b/src/mbgl/style/source_impl.cpp index 595eaf97e..ba2fbb7c3 100644 --- a/src/mbgl/style/source_impl.cpp +++ b/src/mbgl/style/source_impl.cpp @@ -179,8 +179,6 @@ bool Source::Impl::parseTiles(const UpdateParameters& parameters) { } } - updated = parameters.animationTime; - return allTilesUpdated; } diff --git a/src/mbgl/style/source_impl.hpp b/src/mbgl/style/source_impl.hpp index 7a29e3db5..61baccfcb 100644 --- a/src/mbgl/style/source_impl.hpp +++ b/src/mbgl/style/source_impl.hpp @@ -88,9 +88,6 @@ private: virtual Range getZoomRange() = 0; virtual std::unique_ptr createTile(const OverscaledTileID&, const UpdateParameters&) = 0; - // Stores the time when this source was most recently updated. - TimePoint updated = TimePoint::min(); - std::map> tiles; std::map renderTiles; TileCache cache; diff --git a/src/mbgl/style/update_parameters.hpp b/src/mbgl/style/update_parameters.hpp index bdae4f42b..306cddf70 100644 --- a/src/mbgl/style/update_parameters.hpp +++ b/src/mbgl/style/update_parameters.hpp @@ -17,7 +17,6 @@ class UpdateParameters { public: UpdateParameters(float pixelRatio_, MapDebugOptions debugOptions_, - TimePoint animationTime_, const TransformState& transformState_, Worker& worker_, FileSource& fileSource_, @@ -27,7 +26,6 @@ public: Style& style_) : pixelRatio(pixelRatio_), debugOptions(debugOptions_), - animationTime(std::move(animationTime_)), transformState(transformState_), worker(worker_), fileSource(fileSource_), @@ -38,7 +36,6 @@ public: float pixelRatio; MapDebugOptions debugOptions; - TimePoint animationTime; const TransformState& transformState; Worker& worker; FileSource& fileSource; diff --git a/test/style/source.cpp b/test/style/source.cpp index cc23698b2..bffe89a8c 100644 --- a/test/style/source.cpp +++ b/test/style/source.cpp @@ -38,7 +38,6 @@ public: style::UpdateParameters updateParameters { 1.0, MapDebugOptions(), - TimePoint(), transformState, worker, fileSource,