[core] Give Style ownership of new layers

mapbox · Oct 19, 2016 · e43fbf4 · e43fbf4
1 parent a4c44bc
commit e43fbf4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
@@ -159,7 +159,7 @@ class Map : private util::noncopyable {
     // Layers
     std::vector<style::Layer*> getLayers();
     style::Layer* getLayer(const std::string& layerID);
-    void setLayers(std::vector<style::Layer*>&);
+    void setLayers(std::vector<std::unique_ptr<style::Layer>>);
     void addLayer(std::unique_ptr<style::Layer>, const optional<std::string>& beforeLayerID = {});
     void removeLayer(const std::string& layerID);
 

diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm
@@ -168,12 +168,12 @@ - (void)removeSource:(MGLSource *)source
 }
 
 - (void)setLayers:(NS_MUTABLE_ARRAY_OF(MGLStyleLayer *) *)layers {
-    std::vector<mbgl::style::Layer *> rawLayers;
+    std::vector<std::unique_ptr<mbgl::style::Layer>> rawLayers;
     rawLayers.reserve(layers.count);
     for (MGLStyleLayer *layer in layers.reverseObjectEnumerator) {
-        rawLayers.push_back(layer.layer);
+        rawLayers.push_back(std::unique_ptr<mbgl::style::Layer>(layer.layer));
     }
-    self.mapView.mbglMap->setLayers(rawLayers);
+    self.mapView.mbglMap->setLayers(std::move(rawLayers));
 }
 
 - (NSUInteger)countOfLayers

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
@@ -798,10 +798,10 @@ style::Layer* Map::getLayer(const std::string& layerID) {
     return nullptr;
 }
 
-void Map::setLayers(std::vector<style::Layer*>& layers) {
+void Map::setLayers(std::vector<std::unique_ptr<style::Layer>> layers) {
     impl->view.activate();
 
-    impl->style->setLayers(layers);
+    impl->style->setLayers(std::move(layers));
     impl->updateFlags |= Update::Classes;
     impl->asyncUpdate.send();
 

diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
@@ -176,10 +176,10 @@ Layer* Style::getLayer(const std::string& id) const {
     return it != layers.end() ? it->get() : nullptr;
 }
 
-void Style::setLayers(std::vector<Layer*>& newLayers) {
+void Style::setLayers(std::vector<std::unique_ptr<style::Layer>> newLayers) {
     layers.empty();
     for (auto& layer : newLayers) {
-        addLayer(std::unique_ptr<Layer>(layer));
+        addLayer(std::move(layer));
     }
 }
 

diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
@@ -71,7 +71,7 @@ class Style : public GlyphAtlasObserver,
     std::vector<const Layer*> getLayers() const;
     std::vector<Layer*> getLayers();
     Layer* getLayer(const std::string& id) const;
-    void setLayers(std::vector<Layer*>&);
+    void setLayers(std::vector<std::unique_ptr<style::Layer>>);
     Layer* addLayer(std::unique_ptr<Layer>,
                     optional<std::string> beforeLayerID = {});
     void removeLayer(const std::string& layerID);