From 0ff7cf20e971be584410973eb6727e12550604f9 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Sun, 30 Aug 2015 22:31:54 +0300
Subject: [PATCH] Get rid of MapData::{get,set}NeedsRepaint

---
 include/mbgl/map/map.hpp       | 1 -
 platform/default/glfw_view.cpp | 2 +-
 src/mbgl/map/map.cpp           | 4 ----
 src/mbgl/map/map_context.cpp   | 6 +-----
 src/mbgl/map/map_data.hpp      | 9 ---------
 5 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index af69ceffe..ddf86045e 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -165,7 +165,6 @@ public:
     void setDebug(bool value);
     void toggleDebug();
     bool getDebug() const;
-    void setNeedsRepaint();
     void setCollisionDebug(bool value);
     void toggleCollisionDebug();
     bool getCollisionDebug() const;
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index 74fee8c7d..cf7bb0121 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -350,7 +350,7 @@ void GLFWView::run() {
             map->renderSync();
             report(1000 * (glfwGetTime() - started));
             if (benchmark) {
-                map->setNeedsRepaint();
+                map->update(mbgl::Update::Repaint);
             }
         }
     }
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index c09d92712..82ab72db2 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -385,10 +385,6 @@ bool Map::getDebug() const {
     return data->getDebug();
 }
 
-void Map::setNeedsRepaint() {
-    data->setNeedsRepaint(true);
-}
-
 void Map::setCollisionDebug(bool value) {
     data->setCollisionDebug(value);
     update(Update::Repaint);
diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
index ce2fdcd79..94aedb46d 100644
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -256,8 +256,6 @@ void MapContext::update() {
 
     if (!style) {
         updateFlags = Update::Nothing;
-    } else if (data.getNeedsRepaint()) {
-        updateFlags |= Update::Repaint;
     }
 
     if (updateFlags == Update::Nothing || (data.mode == MapMode::Still && !callback)) {
@@ -350,10 +348,8 @@ bool MapContext::renderSync(const TransformState& state, const FrameData& frame)
     view.afterRender();
 
     if (style->hasTransitions() || painter->needsAnimation()) {
-        data.setNeedsRepaint(true);
+        updateFlags |= Update::Repaint;
         asyncUpdate->send();
-    } else {
-        data.setNeedsRepaint(false);
     }
 
     return isLoaded();
diff --git a/src/mbgl/map/map_data.hpp b/src/mbgl/map/map_data.hpp
index 9eac6162e..aadc8dcd6 100644
--- a/src/mbgl/map/map_data.hpp
+++ b/src/mbgl/map/map_data.hpp
@@ -101,14 +101,6 @@ public:
         defaultTransitionDelay = delay;
     }
 
-    inline bool getNeedsRepaint() const {
-        return needsRepaint;
-    }
-
-    inline void setNeedsRepaint(const bool needsRepaint_) {
-        needsRepaint = needsRepaint_;
-    }
-
     util::exclusive<AnnotationManager> getAnnotationManager() {
         return util::exclusive<AnnotationManager>(
             &annotationManager,
@@ -132,7 +124,6 @@ private:
     std::atomic<Duration> defaultFadeDuration;
     std::atomic<Duration> defaultTransitionDuration;
     std::atomic<Duration> defaultTransitionDelay;
-    std::atomic<bool> needsRepaint;
 
 // TODO: make private
 public: