[core] Refactor CustomLayer internals

Move the responsibility for initialization/deinitialization/rendering to RenderCustomLayer. This eliminates special case code from Map and Style.

1 files changed, 1 insertions, 7 deletions

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 0df9f11112..73a540a16a 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -904,20 +904,14 @@ Layer* Map::getLayer(const std::string& layerID) {
 
 void Map::addLayer(std::unique_ptr<Layer> layer, const optional<std::string>& before) {
     impl->styleMutated = true;
-    BackendScope guard(impl->backend);
-
     impl->style->addLayer(std::move(layer), before);
     impl->onUpdate(Update::Repaint);
 }
 
 std::unique_ptr<Layer> Map::removeLayer(const std::string& id) {
     impl->styleMutated = true;
-    BackendScope guard(impl->backend);
-
-    auto removedLayer = impl->style->removeLayer(id);
     impl->onUpdate(Update::Repaint);
-
-    return removedLayer;
+    return impl->style->removeLayer(id);
 }
 
 void Map::addImage(std::unique_ptr<style::Image> image) {