Create a LayerDelegate for recreated layers to draw when their content is invalidated.

ui/wm/core/window_util_unittest.cc

Index: ui/wm/core/window_util_unittest.cc
diff --git a/ui/wm/core/window_util_unittest.cc b/ui/wm/core/window_util_unittest.cc
index 72516bec4217ea1daf4352a96b6fefcddb2d7dab..bd8646bb21bdf6334c51593dc8787a704a705a41 100644
--- a/ui/wm/core/window_util_unittest.cc
+++ b/ui/wm/core/window_util_unittest.cc
@@ -11,8 +11,55 @@
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_tree_owner.h"
+#include "ui/compositor/paint_context.h"
 
 namespace wm {
+namespace {
+class TestLayerDelegate : public ui::LayerDelegate {

[sky, 2016/05/19 20:06:49]

nit: newline between 17/18, and description.

[oshima, 2016/05/19 23:32:21]

Done.

+ public:
+  TestLayerDelegate(ui::LayerDelegate* original_delegate)

[sky, 2016/05/19 20:06:49]

explicit

[oshima, 2016/05/19 23:32:22]

Done.

+      : original_delegate_(original_delegate) {}
+  ~TestLayerDelegate() override = default;
+
+  void OnPaintLayer(const ui::PaintContext& context) override {}

[sky, 2016/05/19 20:06:49]

nit: // ui::LayerDelegate: (or some other prefix)

[oshima, 2016/05/19 23:32:22]

Done.

+  void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {}
+  void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
+  base::Closure PrepareForLayerBoundsChange() override {
+    return base::Closure();
+  }
+
+  ui::LayerDelegate* original_delegate() { return original_delegate_; }
+
+ private:
+  ui::LayerDelegate* original_delegate_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestLayerDelegate);
+};
+
+class TestLayerDelegateFactory : public ::wm::LayerDelegateFactory {

[sky, 2016/05/19 20:06:49]

Description.

[oshima, 2016/05/19 23:32:22]

Done.

+ public:
+  TestLayerDelegateFactory() = default;
+  ~TestLayerDelegateFactory() override = default;
+
+  ui::LayerDelegate* CreateDelegate(ui::LayerDelegate* delegate) override {
+    TestLayerDelegate* new_delegate = new TestLayerDelegate(delegate);
+    delegates_.push_back(base::WrapUnique(new_delegate));
+    return new_delegate;
+  }
+
+  size_t delegate_count() const { return delegates_.size(); }
+
+  TestLayerDelegate* GetDelegateAt(int index) {
+    return delegates_[index].get();
+  }
+
+ private:
+  std::vector<std::unique_ptr<TestLayerDelegate>> delegates_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestLayerDelegateFactory);
+};
+
+}  // namespace
 
 typedef aura::test::AuraTestBase WindowUtilTest;
 
@@ -32,7 +79,8 @@ TEST_F(WindowUtilTest, RecreateLayers) {
   EXPECT_TRUE(acquired.get());
   EXPECT_EQ(acquired.get(), window11->layer());
 
-  std::unique_ptr<ui::LayerTreeOwner> tree = wm::RecreateLayers(window1.get());
+  std::unique_ptr<ui::LayerTreeOwner> tree =
+      wm::RecreateLayers(window1.get(), nullptr);
 
   // The detached layer should not have the layer that has
   // already been detached.
@@ -49,4 +97,36 @@ TEST_F(WindowUtilTest, RecreateLayers) {
   // Delete the window before the acquired layer is deleted.
   window11.reset();
 }
+
+// Test if the LayerDelegateFactory creates new delegates for
+// recreated layers correctly.
+TEST_F(WindowUtilTest, RecreateLayersWithDelegate) {
+  TestLayerDelegateFactory factory;
+  std::unique_ptr<aura::Window> window1(
+      aura::test::CreateTestWindowWithId(0, NULL));
+  std::unique_ptr<aura::Window> window11(
+      aura::test::CreateTestWindowWithId(1, window1.get()));
+  std::unique_ptr<aura::Window> window12(
+      aura::test::CreateTestWindowWithId(2, window1.get()));
+
+  std::unique_ptr<ui::LayerTreeOwner> tree =
+      wm::RecreateLayers(window1.get(), &factory);
+
+  DCHECK_EQ(3u, factory.delegate_count());

[sky, 2016/05/19 20:06:49]

ASSERT_EQ

[oshima, 2016/05/19 23:32:22]

Done.

+
+  TestLayerDelegate* new_delegate_1 = factory.GetDelegateAt(0);
+  TestLayerDelegate* new_delegate_11 = factory.GetDelegateAt(1);
+  TestLayerDelegate* new_delegate_12 = factory.GetDelegateAt(2);
+
+  DCHECK_EQ(window1->layer()->delegate(), new_delegate_1->original_delegate());

[sky, 2016/05/19 20:06:49]

EXPECT_EQ for all of these

[oshima, 2016/05/19 23:32:21]

Done.

+  DCHECK_EQ(window11->layer()->delegate(),
+            new_delegate_11->original_delegate());
+  DCHECK_EQ(window12->layer()->delegate(),
+            new_delegate_12->original_delegate());
+
+  DCHECK_EQ(tree->root()->delegate(), new_delegate_1);
+  DCHECK_EQ(tree->root()->children()[0]->delegate(), new_delegate_11);
+  DCHECK_EQ(tree->root()->children()[1]->delegate(), new_delegate_12);
+}
+
 }  // namespace wm