From c60fd0604aa0c15f92d19b0f58613ed050edea18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Wed, 25 May 2016 19:40:17 +0200
Subject: [PATCH] [core] TileData::isReady() => TileData::isRenderable()

---
 src/mbgl/algorithm/update_renderables_impl.hpp |  2 +-
 src/mbgl/style/style.cpp                       |  2 +-
 src/mbgl/tile/tile_cache.cpp                   |  4 ++--
 src/mbgl/tile/tile_data.hpp                    | 14 +++++---------
 src/mbgl/tile/vector_tile_data.cpp             |  2 +-
 test/algorithm/mock.hpp                        |  2 +-
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/mbgl/algorithm/update_renderables_impl.hpp b/src/mbgl/algorithm/update_renderables_impl.hpp
index 6ec944a85..0f9780102 100644
--- a/src/mbgl/algorithm/update_renderables_impl.hpp
+++ b/src/mbgl/algorithm/update_renderables_impl.hpp
@@ -17,7 +17,7 @@ bool tryTile(const UnwrappedTileID& renderTileID,
              Renderables& renderables) {
     if (renderables.find(renderTileID) == renderables.end()) {
         const auto it = dataTiles.find(dataTileID);
-        if (it == dataTiles.end() || !it->second->isReady()) {
+        if (it == dataTiles.end() || !it->second->isRenderable()) {
             return false;
         }
 
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index c77d1b5a5..bc2a1d9a4 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -288,7 +288,7 @@ RenderData Style::getRenderData() const {
 
         for (auto& pair : source->getTiles()) {
             auto& tile = pair.second;
-            if (!tile.data.isReady()) {
+            if (!tile.data.isRenderable()) {
                 continue;
             }
 
diff --git a/src/mbgl/tile/tile_cache.cpp b/src/mbgl/tile/tile_cache.cpp
index 15e8a38ce..e012ef0b7 100644
--- a/src/mbgl/tile/tile_cache.cpp
+++ b/src/mbgl/tile/tile_cache.cpp
@@ -18,7 +18,7 @@ void TileCache::setSize(size_t size_) {
 }
 
 void TileCache::add(const OverscaledTileID& key, std::unique_ptr<TileData> data) {
-    if (!data->isReady() || !size) {
+    if (!data->isRenderable() || !size) {
         return;
     }
 
@@ -48,7 +48,7 @@ std::unique_ptr<TileData> TileCache::get(const OverscaledTileID& key) {
         data = std::move(it->second);
         tiles.erase(it);
         orderedKeys.remove(key);
-        assert(data->isReady());
+        assert(data->isRenderable());
     }
 
     return data;
diff --git a/src/mbgl/tile/tile_data.hpp b/src/mbgl/tile/tile_data.hpp
index 6552ad0f9..f8fbbf078 100644
--- a/src/mbgl/tile/tile_data.hpp
+++ b/src/mbgl/tile/tile_data.hpp
@@ -66,13 +66,6 @@ public:
 
     static const char* StateToString(State);
 
-    // Tile data considered "Ready" can be used for rendering. Data in
-    // partial state is still waiting for network resources but can also
-    // be rendered, although layers will be missing.
-    inline static bool isReadyState(const State& state) {
-        return state == State::partial || state == State::parsed;
-    }
-
     TileData(const OverscaledTileID&);
     virtual ~TileData();
 
@@ -91,8 +84,11 @@ public:
             const TransformState&,
             const optional<std::vector<std::string>>& layerIDs);
 
-    bool isReady() const {
-        return isReadyState(state);
+    // Tile data considered "Renderable" can be used for rendering. Data in
+    // partial state is still waiting for network resources but can also
+    // be rendered, although layers will be missing.
+    bool isRenderable() const {
+        return state == State::partial || state == State::parsed;
     }
 
     // Returns true when there's at least some data that we can render.
diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp
index 10b5bae18..a707d4882 100644
--- a/src/mbgl/tile/vector_tile_data.cpp
+++ b/src/mbgl/tile/vector_tile_data.cpp
@@ -53,7 +53,7 @@ VectorTileData::VectorTileData(const OverscaledTileID& id_,
 
         if (state == State::loading) {
             state = State::loaded;
-        } else if (isReady()) {
+        } else if (isRenderable()) {
             state = State::partial;
         }
 
diff --git a/test/algorithm/mock.hpp b/test/algorithm/mock.hpp
index 0faddcac7..a1ee534f7 100644
--- a/test/algorithm/mock.hpp
+++ b/test/algorithm/mock.hpp
@@ -44,7 +44,7 @@ struct MockBucket {};
 
 
 struct MockTileData {
-    bool isReady() {
+    bool isRenderable() {
         return ready;
     }