diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-01-09 13:05:13 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-01-10 10:15:22 -0800 |
| commit | e7778509c546f4d1e0dd73e2d1deceb146c90de2 (patch) | |
| tree | d8101c341d45a6a011cb37101f486814be7a6259 /src/mbgl/style/layers/symbol_layer_impl.hpp | |
| parent | ea4c0b77c39926c770b0003097509e36dc26621d (diff) | |
| download | qtlocation-mapboxgl-e7778509c546f4d1e0dd73e2d1deceb146c90de2.tar.gz | |
[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.
Diffstat (limited to 'src/mbgl/style/layers/symbol_layer_impl.hpp')
| -rw-r--r-- | src/mbgl/style/layers/symbol_layer_impl.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |