summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2015-08-30 22:31:54 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2015-09-02 23:20:47 +0300
commit0ff7cf20e971be584410973eb6727e12550604f9 (patch)
tree824300bc8f91e1afb65c2d2dc27a80c1efd3c502 /src
parent0b501e056697249ae080a686dd0047eb2060eaf9 (diff)
downloadqtlocation-mapboxgl-0ff7cf20e971be584410973eb6727e12550604f9.tar.gz
Get rid of MapData::{get,set}NeedsRepaint
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/map/map.cpp4
-rw-r--r--src/mbgl/map/map_context.cpp6
-rw-r--r--src/mbgl/map/map_data.hpp9
3 files changed, 1 insertions, 18 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index c09d927129..82ab72db2d 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 ce2fdcd79b..94aedb46da 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 9eac6162eb..aadc8dcd64 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: