[core] Observe visibility changes

2 files changed, 19 insertions, 0 deletions

diff --git a/test/src/mbgl/test/stub_layer_observer.hpp b/test/src/mbgl/test/stub_layer_observer.hpp
index 500103055d..f346080b10 100644
--- a/test/src/mbgl/test/stub_layer_observer.hpp
+++ b/test/src/mbgl/test/stub_layer_observer.hpp
@@ -14,6 +14,10 @@ public:
         if (layerFilterChanged) layerFilterChanged(layer);
     }
 
+    void onLayerVisibilityChanged(Layer& layer) override {
+        if (layerVisibilityChanged) layerVisibilityChanged(layer);
+    }
+
     void onLayerPaintPropertyChanged(Layer& layer) override {
         if (layerPaintPropertyChanged) layerPaintPropertyChanged(layer);
     }
@@ -23,6 +27,7 @@ public:
     }
 
     std::function<void (Layer&)> layerFilterChanged;
+    std::function<void (Layer&)> layerVisibilityChanged;
     std::function<void (Layer&)> layerPaintPropertyChanged;
     std::function<void (Layer&)> layerLayoutPropertyChanged;
 };
diff --git a/test/style/style_layer.cpp b/test/style/style_layer.cpp
index 0d2ed88edd..08952e3799 100644
--- a/test/style/style_layer.cpp
+++ b/test/style/style_layer.cpp
@@ -226,6 +226,15 @@ TEST(Layer, Observer) {
     layer->setFilter(NullFilter());
     EXPECT_TRUE(filterChanged);
 
+    // Notifies observer on visibility change.
+    bool visibilityChanged = false;
+    observer.layerVisibilityChanged = [&] (Layer& layer_) {
+        EXPECT_EQ(layer.get(), &layer_);
+        visibilityChanged = true;
+    };
+    layer->setVisibility(VisibilityType::None);
+    EXPECT_TRUE(visibilityChanged);
+
     // Notifies observer on paint property change.
     bool paintPropertyChanged = false;
     observer.layerPaintPropertyChanged = [&] (Layer& layer_) {
@@ -244,6 +253,11 @@ TEST(Layer, Observer) {
     layer->setLineCap(lineCap);
     EXPECT_TRUE(layoutPropertyChanged);
 
+    // Does not notify observer on no-op visibility change.
+    visibilityChanged = false;
+    layer->setVisibility(VisibilityType::None);
+    EXPECT_FALSE(visibilityChanged);
+
     // Does not notify observer on no-op paint property change.
     paintPropertyChanged = false;
     layer->setLineColor(color);