| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/wm/core/window_util.h" | 5 #include "ui/wm/core/window_util.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "ui/aura/test/aura_test_base.h" | 9 #include "ui/aura/test/aura_test_base.h" |
| 10 #include "ui/aura/test/test_windows.h" | 10 #include "ui/aura/test/test_windows.h" |
| 11 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
| 12 #include "ui/compositor/layer.h" | 12 #include "ui/compositor/layer.h" |
| 13 #include "ui/compositor/layer_tree_owner.h" | 13 #include "ui/compositor/layer_tree_owner.h" |
| 14 #include "ui/compositor/paint_context.h" | 14 #include "ui/compositor/paint_context.h" |
| 15 | 15 |
| 16 namespace wm { | 16 namespace wm { |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 // Used to check if the delegate for recreated layer is created for | 19 // Used to check if the delegate for recreated layer is created for |
| 20 // the correct delegate. | 20 // the correct delegate. |
| 21 class TestLayerDelegate : public ui::LayerDelegate { | 21 class TestLayerDelegate : public ui::LayerDelegate { |
| 22 public: | 22 public: |
| 23 explicit TestLayerDelegate(ui::LayerDelegate* original_delegate) | 23 explicit TestLayerDelegate(ui::Layer* original_layer) |
| 24 : original_delegate_(original_delegate) {} | 24 : original_layer_(original_layer) {} |
| 25 ~TestLayerDelegate() override = default; | 25 ~TestLayerDelegate() override = default; |
| 26 | 26 |
| 27 // ui::LayerDelegate: | 27 // ui::LayerDelegate: |
| 28 void OnPaintLayer(const ui::PaintContext& context) override {} | 28 void OnPaintLayer(const ui::PaintContext& context) override {} |
| 29 void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {} | 29 void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {} |
| 30 void OnDeviceScaleFactorChanged(float device_scale_factor) override {} | 30 void OnDeviceScaleFactorChanged(float device_scale_factor) override {} |
| 31 base::Closure PrepareForLayerBoundsChange() override { | 31 base::Closure PrepareForLayerBoundsChange() override { |
| 32 return base::Closure(); | 32 return base::Closure(); |
| 33 } | 33 } |
| 34 | 34 |
| 35 ui::LayerDelegate* original_delegate() { return original_delegate_; } | 35 ui::Layer* original_layer() { return original_layer_; } |
| 36 | 36 |
| 37 private: | 37 private: |
| 38 ui::LayerDelegate* original_delegate_; | 38 ui::Layer* original_layer_; |
| 39 | 39 |
| 40 DISALLOW_COPY_AND_ASSIGN(TestLayerDelegate); | 40 DISALLOW_COPY_AND_ASSIGN(TestLayerDelegate); |
| 41 }; | 41 }; |
| 42 | 42 |
| 43 // Used to create a TestLayerDelegate for recreated layers. | 43 // Used to create a TestLayerDelegate for recreated layers. |
| 44 class TestLayerDelegateFactory : public ::wm::LayerDelegateFactory { | 44 class TestLayerDelegateFactory : public ::wm::LayerDelegateFactory { |
| 45 public: | 45 public: |
| 46 TestLayerDelegateFactory() = default; | 46 TestLayerDelegateFactory() = default; |
| 47 ~TestLayerDelegateFactory() override = default; | 47 ~TestLayerDelegateFactory() override = default; |
| 48 | 48 |
| 49 // ::wm::LayerDelegateFactory: | 49 // ::wm::LayerDelegateFactory: |
| 50 ui::LayerDelegate* CreateDelegate(ui::LayerDelegate* delegate) override { | 50 ui::LayerDelegate* CreateDelegate(ui::Layer* new_layer, |
| 51 TestLayerDelegate* new_delegate = new TestLayerDelegate(delegate); | 51 ui::Layer* original_layer) override { |
| 52 delegates_.push_back(base::WrapUnique(new_delegate)); | 52 delegates_.push_back(base::MakeUnique<TestLayerDelegate>(original_layer)); |
| 53 return new_delegate; | 53 return delegates_.back().get(); |
| 54 } | 54 } |
| 55 | 55 |
| 56 size_t delegate_count() const { return delegates_.size(); } | 56 size_t delegate_count() const { return delegates_.size(); } |
| 57 | 57 |
| 58 TestLayerDelegate* GetDelegateAt(int index) { | 58 TestLayerDelegate* GetDelegateAt(int index) { |
| 59 return delegates_[index].get(); | 59 return delegates_[index].get(); |
| 60 } | 60 } |
| 61 | 61 |
| 62 private: | 62 private: |
| 63 std::vector<std::unique_ptr<TestLayerDelegate>> delegates_; | 63 std::vector<std::unique_ptr<TestLayerDelegate>> delegates_; |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 | 117 |
| 118 std::unique_ptr<ui::LayerTreeOwner> tree = | 118 std::unique_ptr<ui::LayerTreeOwner> tree = |
| 119 wm::RecreateLayers(window1.get(), &factory); | 119 wm::RecreateLayers(window1.get(), &factory); |
| 120 | 120 |
| 121 ASSERT_EQ(3u, factory.delegate_count()); | 121 ASSERT_EQ(3u, factory.delegate_count()); |
| 122 | 122 |
| 123 TestLayerDelegate* new_delegate_1 = factory.GetDelegateAt(0); | 123 TestLayerDelegate* new_delegate_1 = factory.GetDelegateAt(0); |
| 124 TestLayerDelegate* new_delegate_11 = factory.GetDelegateAt(1); | 124 TestLayerDelegate* new_delegate_11 = factory.GetDelegateAt(1); |
| 125 TestLayerDelegate* new_delegate_12 = factory.GetDelegateAt(2); | 125 TestLayerDelegate* new_delegate_12 = factory.GetDelegateAt(2); |
| 126 | 126 |
| 127 EXPECT_EQ(window1->layer()->delegate(), new_delegate_1->original_delegate()); | 127 EXPECT_EQ(window1->layer(), new_delegate_1->original_layer()); |
| 128 EXPECT_EQ(window11->layer()->delegate(), | 128 EXPECT_EQ(window11->layer(), |
| 129 new_delegate_11->original_delegate()); | 129 new_delegate_11->original_layer()); |
| 130 EXPECT_EQ(window12->layer()->delegate(), | 130 EXPECT_EQ(window12->layer(), |
| 131 new_delegate_12->original_delegate()); | 131 new_delegate_12->original_layer()); |
| 132 | 132 |
| 133 EXPECT_EQ(tree->root()->delegate(), new_delegate_1); | 133 EXPECT_EQ(tree->root()->delegate(), new_delegate_1); |
| 134 EXPECT_EQ(tree->root()->children()[0]->delegate(), new_delegate_11); | 134 EXPECT_EQ(tree->root()->children()[0]->delegate(), new_delegate_11); |
| 135 EXPECT_EQ(tree->root()->children()[1]->delegate(), new_delegate_12); | 135 EXPECT_EQ(tree->root()->children()[1]->delegate(), new_delegate_12); |
| 136 } | 136 } |
| 137 | 137 |
| 138 } // namespace wm | 138 } // namespace wm |
| OLD | NEW |