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.
---
 test/style/group_by_layout.test.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'test/style')

diff --git a/test/style/group_by_layout.test.cpp b/test/style/group_by_layout.test.cpp
index d74916cdc9..600ba6a0f1 100644
--- a/test/style/group_by_layout.test.cpp
+++ b/test/style/group_by_layout.test.cpp
@@ -12,7 +12,7 @@ TEST(GroupByLayout, Related) {
     std::vector<std::unique_ptr<Layer>> layers;
     layers.push_back(std::make_unique<LineLayer>("a", "source"));
     layers.push_back(std::make_unique<LineLayer>("b", "source"));
-    auto result = groupByLayout(std::move(layers));
+    auto result = groupByLayout(layers);
     ASSERT_EQ(1u, result.size());
     ASSERT_EQ(2u, result[0].size());
 }
@@ -21,7 +21,7 @@ TEST(GroupByLayout, UnrelatedType) {
     std::vector<std::unique_ptr<Layer>> layers;
     layers.push_back(std::make_unique<BackgroundLayer>("background"));
     layers.push_back(std::make_unique<CircleLayer>("circle", "source"));
-    auto result = groupByLayout(std::move(layers));
+    auto result = groupByLayout(layers);
     ASSERT_EQ(2u, result.size());
 }
 
@@ -30,7 +30,7 @@ TEST(GroupByLayout, UnrelatedFilter) {
     layers.push_back(std::make_unique<LineLayer>("a", "source"));
     layers.push_back(std::make_unique<LineLayer>("b", "source"));
     layers[0]->as<LineLayer>()->setFilter(EqualsFilter());
-    auto result = groupByLayout(std::move(layers));
+    auto result = groupByLayout(layers);
     ASSERT_EQ(2u, result.size());
 }
 
@@ -39,6 +39,6 @@ TEST(GroupByLayout, UnrelatedLayout) {
     layers.push_back(std::make_unique<LineLayer>("a", "source"));
     layers.push_back(std::make_unique<LineLayer>("b", "source"));
     layers[0]->as<LineLayer>()->setLineCap(LineCapType::Square);
-    auto result = groupByLayout(std::move(layers));
+    auto result = groupByLayout(layers);
     ASSERT_EQ(2u, result.size());
 }
-- 
cgit v1.2.1