From abdf205510b1f2d7b3e0c9b432f17c8c4d71e895 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 8 Jun 2015 20:16:40 -0400
Subject: [PATCH] =?UTF-8?q?Rename=20workerData=20=E2=87=A2=20tileWorker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mbgl/map/live_tile_data.cpp   |  2 +-
 src/mbgl/map/vector_tile_data.cpp | 12 ++++++------
 src/mbgl/map/vector_tile_data.hpp |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mbgl/map/live_tile_data.cpp b/src/mbgl/map/live_tile_data.cpp
index a760e33fc..22f9a54b4 100644
--- a/src/mbgl/map/live_tile_data.cpp
+++ b/src/mbgl/map/live_tile_data.cpp
@@ -37,7 +37,7 @@ bool LiveTileData::reparse(Worker& worker, std::function<void()> callback) {
 
     parsing = true;
 
-    workRequest = worker.parseLiveTile(workerData, *tile, [this, callback] (TileParseResult result) {
+    workRequest = worker.parseLiveTile(tileWorker, *tile, [this, callback] (TileParseResult result) {
         parsing = false;
 
         if (state == State::obsolete) {
diff --git a/src/mbgl/map/vector_tile_data.cpp b/src/mbgl/map/vector_tile_data.cpp
index bf4c0f581..d0f4b131f 100644
--- a/src/mbgl/map/vector_tile_data.cpp
+++ b/src/mbgl/map/vector_tile_data.cpp
@@ -18,7 +18,7 @@ VectorTileData::VectorTileData(const TileID& id_,
                                float angle,
                                bool collisionDebug)
     : TileData(id_),
-      workerData(id_,
+      tileWorker(id_,
                  style_,
                  source_.max_zoom,
                  state,
@@ -66,7 +66,7 @@ bool VectorTileData::reparse(Worker&, std::function<void()> callback) {
 
     parsing = true;
 
-    workRequest = worker.parseVectorTile(workerData, data, [this, callback] (TileParseResult result) {
+    workRequest = worker.parseVectorTile(tileWorker, data, [this, callback] (TileParseResult result) {
         parsing = false;
 
         if (state == State::obsolete) {
@@ -93,11 +93,11 @@ Bucket* VectorTileData::getBucket(const StyleLayer& layer) {
         return nullptr;
     }
 
-    return workerData.getBucket(layer);
+    return tileWorker.getBucket(layer);
 }
 
 size_t VectorTileData::countBuckets() const {
-    return workerData.countBuckets();
+    return tileWorker.countBuckets();
 }
 
 void VectorTileData::redoPlacement(float angle, bool collisionDebug) {
@@ -114,8 +114,8 @@ void VectorTileData::redoPlacement(float angle, bool collisionDebug) {
     currentAngle = angle;
     currentCollisionDebug = collisionDebug;
 
-    workRequest = worker.redoPlacement(workerData, angle, collisionDebug, [this] {
-        for (const auto& layer : workerData.style.layers) {
+    workRequest = worker.redoPlacement(tileWorker, angle, collisionDebug, [this] {
+        for (const auto& layer : tileWorker.style.layers) {
             auto bucket = getBucket(*layer);
             if (bucket) {
                 bucket->swapRenderData();
diff --git a/src/mbgl/map/vector_tile_data.hpp b/src/mbgl/map/vector_tile_data.hpp
index e12554d85..6b866de37 100644
--- a/src/mbgl/map/vector_tile_data.hpp
+++ b/src/mbgl/map/vector_tile_data.hpp
@@ -39,7 +39,7 @@ public:
     void cancel() override;
 
 protected:
-    TileWorker workerData;
+    TileWorker tileWorker;
     std::unique_ptr<WorkRequest> workRequest;
     bool parsing = false;