Move Transform from MapData to Map

Pass current state to MapContext where needed. Remove mutex from
Transform.

1 files changed, 3 insertions, 6 deletions

diff --git a/src/mbgl/map/map_context.hpp b/src/mbgl/map/map_context.hpp
index 810219e6b0..fedafb7d09 100644
--- a/src/mbgl/map/map_context.hpp
+++ b/src/mbgl/map/map_context.hpp
@@ -38,10 +38,10 @@ public:
     void resize(uint16_t width, uint16_t height, float ratio);
 
     using StillImageCallback = std::function<void(std::exception_ptr, std::unique_ptr<const StillImage>)>;
-    void renderStill(StillImageCallback callback);
-    void renderSync();
 
-    void triggerUpdate(Update = Update::Nothing);
+    void triggerUpdate(const TransformState&, Update = Update::Nothing);
+    void renderStill(const TransformState&, StillImageCallback callback);
+    bool renderSync(const TransformState&);
 
     void setStyleURL(const std::string&);
     void setStyleJSON(const std::string& json, const std::string& base);
@@ -61,8 +61,6 @@ public:
     void onResourceLoadingFailed(std::exception_ptr error) override;
 
 private:
-    void render();
-
     // Style-related updates.
     void cascadeClasses();
 
@@ -87,7 +85,6 @@ private:
     std::string styleURL;
     std::string styleJSON;
 
-    bool mayRender = false;
     StillImageCallback callback;
     size_t sourceCacheSize;
     TransformState transformState;