From e1a58565c88a80e5b68181e69fd3a8b4bfe3e85c Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 2 Jun 2016 15:44:39 -0700
Subject: [PATCH] [core] Move RenderData alongside RenderItem

---
 src/mbgl/renderer/painter.hpp     |  7 +++---
 src/mbgl/renderer/render_item.hpp | 38 +++++++++++++++++++++++++++++++
 src/mbgl/style/render_item.hpp    | 24 -------------------
 src/mbgl/style/style.cpp          |  1 +
 src/mbgl/style/style.hpp          | 11 +--------
 5 files changed, 43 insertions(+), 38 deletions(-)
 create mode 100644 src/mbgl/renderer/render_item.hpp
 delete mode 100644 src/mbgl/style/render_item.hpp

diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
index f040fee67..25627a8d7 100644
--- a/src/mbgl/renderer/painter.hpp
+++ b/src/mbgl/renderer/painter.hpp
@@ -5,18 +5,17 @@
 #include <mbgl/tile/tile_id.hpp>
 
 #include <mbgl/renderer/frame_history.hpp>
+#include <mbgl/renderer/render_item.hpp>
 #include <mbgl/renderer/bucket.hpp>
 
 #include <mbgl/geometry/vao.hpp>
 #include <mbgl/geometry/static_vertex_buffer.hpp>
 
 #include <mbgl/gl/gl_config.hpp>
-
-#include <mbgl/style/render_item.hpp>
-#include <mbgl/style/style.hpp>
-
 #include <mbgl/gl/gl.hpp>
 
+#include <mbgl/style/style.hpp>
+
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/util/constants.hpp>
diff --git a/src/mbgl/renderer/render_item.hpp b/src/mbgl/renderer/render_item.hpp
new file mode 100644
index 000000000..6c97b66bd
--- /dev/null
+++ b/src/mbgl/renderer/render_item.hpp
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <mbgl/util/color.hpp>
+
+#include <set>
+#include <vector>
+
+namespace mbgl {
+
+class Tile;
+class Bucket;
+
+namespace style {
+class Layer;
+class Source;
+}
+
+class RenderItem {
+public:
+    RenderItem(const style::Layer& layer_,
+               const Tile* tile_ = nullptr,
+               Bucket* bucket_ = nullptr)
+        : tile(tile_), bucket(bucket_), layer(layer_) {
+    }
+
+    const Tile* const tile;
+    Bucket* const bucket;
+    const style::Layer& layer;
+};
+
+class RenderData {
+public:
+    Color backgroundColor = {{ 0, 0, 0, 0 }};
+    std::set<style::Source*> sources;
+    std::vector<RenderItem> order;
+};
+
+} // namespace mbgl
diff --git a/src/mbgl/style/render_item.hpp b/src/mbgl/style/render_item.hpp
deleted file mode 100644
index da59591c3..000000000
--- a/src/mbgl/style/render_item.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-namespace mbgl {
-
-class Tile;
-class Bucket;
-
-namespace style {
-class Layer;
-}
-
-struct RenderItem {
-    inline RenderItem(const style::Layer& layer_,
-                      const Tile* tile_ = nullptr,
-                      Bucket* bucket_ = nullptr)
-        : tile(tile_), bucket(bucket_), layer(layer_) {
-    }
-
-    const Tile* const tile;
-    Bucket* const bucket;
-    const style::Layer& layer;
-};
-
-} // namespace mbgl
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 136c98df0..b86845154 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -18,6 +18,7 @@
 #include <mbgl/style/update_parameters.hpp>
 #include <mbgl/style/cascade_parameters.hpp>
 #include <mbgl/style/calculation_parameters.hpp>
+#include <mbgl/renderer/render_item.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
 #include <mbgl/util/constants.hpp>
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index 49af67433..a679681f4 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
-#include <mbgl/style/render_item.hpp>
 #include <mbgl/style/transition_options.hpp>
-
 #include <mbgl/style/observer.hpp>
 #include <mbgl/style/source_observer.hpp>
 #include <mbgl/text/glyph_store_observer.hpp>
@@ -15,12 +13,10 @@
 #include <mbgl/util/worker.hpp>
 #include <mbgl/util/optional.hpp>
 #include <mbgl/util/feature.hpp>
-#include <mbgl/util/color.hpp>
 
 #include <cstdint>
 #include <string>
 #include <vector>
-#include <set>
 
 namespace mbgl {
 
@@ -28,12 +24,7 @@ class FileSource;
 class GlyphAtlas;
 class SpriteAtlas;
 class LineAtlas;
-
-struct RenderData {
-    Color backgroundColor = {{ 0, 0, 0, 0 }};
-    std::set<style::Source*> sources;
-    std::vector<RenderItem> order;
-};
+class RenderData;
 
 namespace style {