summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-09-05 19:04:34 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-09-05 19:04:34 +0200
commit4eb54270d773bf60f948176c3ff7827d7f818a92 (patch)
tree41c88a09ec203fbc333c17519444d4b5abb937ac
parent46b73b8a2cf5748596ab6023e2cb1f2ce45d2b0d (diff)
downloadqtlocation-mapboxgl-4eb54270d773bf60f948176c3ff7827d7f818a92.tar.gz
[core] remove unused TimePoint during Source update
-rw-r--r--src/mbgl/map/map.cpp1
-rw-r--r--src/mbgl/style/source_impl.cpp2
-rw-r--r--src/mbgl/style/source_impl.hpp3
-rw-r--r--src/mbgl/style/update_parameters.hpp3
-rw-r--r--test/style/source.cpp1
5 files changed, 0 insertions, 10 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index cb3a1fefcb..5c58893b5a 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 595eaf97e5..ba2fbb7c30 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 7a29e3db54..61baccfcb7 100644
--- a/src/mbgl/style/source_impl.hpp
+++ b/src/mbgl/style/source_impl.hpp
@@ -88,9 +88,6 @@ private:
virtual Range<uint8_t> getZoomRange() = 0;
virtual std::unique_ptr<Tile> createTile(const OverscaledTileID&, const UpdateParameters&) = 0;
- // Stores the time when this source was most recently updated.
- TimePoint updated = TimePoint::min();
-
std::map<OverscaledTileID, std::unique_ptr<Tile>> tiles;
std::map<UnwrappedTileID, RenderTile> renderTiles;
TileCache cache;
diff --git a/src/mbgl/style/update_parameters.hpp b/src/mbgl/style/update_parameters.hpp
index bdae4f42b0..306cddf706 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 cc23698b2b..bffe89a8c3 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,