From e7778509c546f4d1e0dd73e2d1deceb146c90de2 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 9 Jan 2017 13:05:13 -0800
Subject: [core] Fix flickering caused by regression in #7586

It should be safe to invoke GeometryTileWorker::setData multiple times without invoking GeometryTileWorker::setLayers. Therefore GeometryTileWorker::redoLayout() must not consume the layers.
---
 src/mbgl/style/layers/symbol_layer_impl.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mbgl/style/layers/symbol_layer_impl.hpp')

diff --git a/src/mbgl/style/layers/symbol_layer_impl.hpp b/src/mbgl/style/layers/symbol_layer_impl.hpp
index 0d9a7c07e3..db18da07e2 100644
--- a/src/mbgl/style/layers/symbol_layer_impl.hpp
+++ b/src/mbgl/style/layers/symbol_layer_impl.hpp
@@ -52,7 +52,7 @@ public:
 
     std::unique_ptr<Bucket> createBucket(BucketParameters&, const GeometryTileLayer&) const override;
     std::unique_ptr<SymbolLayout> createLayout(BucketParameters&, const GeometryTileLayer&,
-                                               std::vector<std::unique_ptr<Layer>>) const;
+                                               std::vector<std::string>) const;
 
     SymbolPropertyValues iconPropertyValues(const SymbolLayoutProperties::Evaluated&) const;
     SymbolPropertyValues textPropertyValues(const SymbolLayoutProperties::Evaluated&) const;
-- 
cgit v1.2.1