[core] Let placement transitions use the transition duration, if set, and allow disabling them entirely

1 files changed, 4 insertions, 1 deletions

diff --git a/src/mbgl/text/placement.hpp b/src/mbgl/text/placement.hpp
index f34a8a25c2..cc23110e54 100644
--- a/src/mbgl/text/placement.hpp
+++ b/src/mbgl/text/placement.hpp
@@ -5,6 +5,7 @@
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/text/collision_index.hpp>
 #include <mbgl/layout/symbol_projection.hpp>
+#include <mbgl/style/transition_options.hpp>
 #include <unordered_set>
 
 namespace mbgl {
@@ -79,7 +80,7 @@ private:
     
 class Placement {
 public:
-    Placement(const TransformState&, MapMode mapMode, const bool crossSourceCollisions);
+    Placement(const TransformState&, MapMode, style::TransitionOptions, const bool crossSourceCollisions);
     void placeLayer(const RenderLayerSymbolInterface&, const mat4&, bool showCollisionBoxes);
     void commit(const Placement& prevPlacement, TimePoint);
     void updateLayerOpacities(const RenderLayerSymbolInterface&);
@@ -113,6 +114,8 @@ private:
 
     TransformState state;
     MapMode mapMode;
+    style::TransitionOptions transitionOptions;
+
     TimePoint fadeStartTime;
     TimePoint commitTime;