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/layout/symbol_layout.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/layout/symbol_layout.hpp')
| -rw-r--r-- | src/mbgl/layout/symbol_layout.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp index 63c0a8859d..c89b791ccc 100644 --- a/src/mbgl/layout/symbol_layout.hpp +++ b/src/mbgl/layout/symbol_layout.hpp @@ -28,7 +28,7 @@ struct Anchor; class SymbolLayout { public: - SymbolLayout(std::vector<std::unique_ptr<style::Layer>>, + SymbolLayout(std::vector<std::string> layerIDs_, std::string sourceLayerName_, uint32_t overscaling, float zoom, @@ -56,7 +56,7 @@ public: State state = Pending; - const std::vector<std::unique_ptr<style::Layer>> layers; + const std::vector<std::string> layerIDs; const std::string sourceLayerName; private: |