Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: cc/layers/heads_up_display_unittest.cc

Issue 2251143002: cc: Reland Move data to LayerTree from LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better fix? Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "cc/layers/heads_up_display_layer.h" 5 #include "cc/layers/heads_up_display_layer.h"
6 #include "cc/layers/layer.h" 6 #include "cc/layers/layer.h"
7 #include "cc/test/layer_tree_test.h" 7 #include "cc/test/layer_tree_test.h"
8 #include "cc/trees/layer_tree_host.h" 8 #include "cc/trees/layer_tree_host.h"
9 9
10 namespace cc { 10 namespace cc {
(...skipping 29 matching lines...) Expand all
40 void BeginTest() override { 40 void BeginTest() override {
41 root_layer1_->SetBounds(gfx::Size(30, 30)); 41 root_layer1_->SetBounds(gfx::Size(30, 30));
42 root_layer2_->SetBounds(gfx::Size(30, 30)); 42 root_layer2_->SetBounds(gfx::Size(30, 30));
43 43
44 PostSetNeedsCommitToMainThread(); 44 PostSetNeedsCommitToMainThread();
45 } 45 }
46 46
47 void DidCommit() override { 47 void DidCommit() override {
48 ++num_commits_; 48 ++num_commits_;
49 49
50 ASSERT_TRUE(layer_tree_host()->hud_layer()); 50 ASSERT_TRUE(layer_tree()->hud_layer());
51 51
52 switch (num_commits_) { 52 switch (num_commits_) {
53 case 1: 53 case 1:
54 // Change directly to a new root layer. 54 // Change directly to a new root layer.
55 layer_tree_host()->SetRootLayer(root_layer1_); 55 layer_tree()->SetRootLayer(root_layer1_);
56 break; 56 break;
57 case 2: 57 case 2:
58 EXPECT_EQ(root_layer1_.get(), layer_tree_host()->hud_layer()->parent()); 58 EXPECT_EQ(root_layer1_.get(), layer_tree()->hud_layer()->parent());
59 // Unset the root layer. 59 // Unset the root layer.
60 layer_tree_host()->SetRootLayer(nullptr); 60 layer_tree()->SetRootLayer(nullptr);
61 break; 61 break;
62 case 3: 62 case 3:
63 EXPECT_EQ(0, layer_tree_host()->hud_layer()->parent()); 63 EXPECT_EQ(0, layer_tree()->hud_layer()->parent());
64 // Change back to the previous root layer. 64 // Change back to the previous root layer.
65 layer_tree_host()->SetRootLayer(root_layer1_); 65 layer_tree()->SetRootLayer(root_layer1_);
66 break; 66 break;
67 case 4: 67 case 4:
68 EXPECT_EQ(root_layer1_.get(), layer_tree_host()->hud_layer()->parent()); 68 EXPECT_EQ(root_layer1_.get(), layer_tree()->hud_layer()->parent());
69 // Unset the root layer. 69 // Unset the root layer.
70 layer_tree_host()->SetRootLayer(nullptr); 70 layer_tree()->SetRootLayer(nullptr);
71 break; 71 break;
72 case 5: 72 case 5:
73 EXPECT_EQ(0, layer_tree_host()->hud_layer()->parent()); 73 EXPECT_EQ(0, layer_tree()->hud_layer()->parent());
74 // Change to a new root layer from a null root. 74 // Change to a new root layer from a null root.
75 layer_tree_host()->SetRootLayer(root_layer2_); 75 layer_tree()->SetRootLayer(root_layer2_);
76 break; 76 break;
77 case 6: 77 case 6:
78 EXPECT_EQ(root_layer2_.get(), layer_tree_host()->hud_layer()->parent()); 78 EXPECT_EQ(root_layer2_.get(), layer_tree()->hud_layer()->parent());
79 // Change directly back to the last root layer/ 79 // Change directly back to the last root layer/
80 layer_tree_host()->SetRootLayer(root_layer1_); 80 layer_tree()->SetRootLayer(root_layer1_);
81 break; 81 break;
82 case 7: 82 case 7:
83 EXPECT_EQ(root_layer1_.get(), layer_tree_host()->hud_layer()->parent()); 83 EXPECT_EQ(root_layer1_.get(), layer_tree()->hud_layer()->parent());
84 EndTest(); 84 EndTest();
85 break; 85 break;
86 } 86 }
87 } 87 }
88 88
89 void AfterTest() override {} 89 void AfterTest() override {}
90 90
91 private: 91 private:
92 scoped_refptr<DrawsContentLayer> root_layer1_; 92 scoped_refptr<DrawsContentLayer> root_layer1_;
93 scoped_refptr<DrawsContentLayer> root_layer2_; 93 scoped_refptr<DrawsContentLayer> root_layer2_;
94 int num_commits_; 94 int num_commits_;
95 }; 95 };
96 96
97 MULTI_THREAD_TEST_F(HudWithRootLayerChange); 97 MULTI_THREAD_TEST_F(HudWithRootLayerChange);
98 98
99 } // namespace 99 } // namespace
100 } // namespace cc 100 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698