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

Side by Side Diff: cc/trees/layer_tree_host_unittest_picture.cc

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include "cc/test/fake_content_layer_client.h" 7 #include "cc/test/fake_content_layer_client.h"
8 #include "cc/test/fake_picture_layer.h" 8 #include "cc/test/fake_picture_layer.h"
9 #include "cc/test/fake_picture_layer_impl.h" 9 #include "cc/test/fake_picture_layer_impl.h"
10 #include "cc/test/layer_tree_test.h" 10 #include "cc/test/layer_tree_test.h"
11 #include "cc/trees/layer_tree_impl.h" 11 #include "cc/trees/layer_tree_impl.h"
12 12
13 namespace cc { 13 namespace cc {
14 namespace { 14 namespace {
15 15
16 // These tests deal with picture layers. 16 // These tests deal with picture layers.
17 class LayerTreeHostPictureTest : public LayerTreeTest { 17 class LayerTreeHostPictureTest : public LayerTreeTest {
18 protected: 18 protected:
19 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 19 virtual void InitializeSettings(LayerTreeSettings* settings) override {
20 // PictureLayer can only be used with impl side painting enabled. 20 // PictureLayer can only be used with impl side painting enabled.
21 settings->impl_side_painting = true; 21 settings->impl_side_painting = true;
22 } 22 }
23 }; 23 };
24 24
25 class LayerTreeHostPictureTestTwinLayer 25 class LayerTreeHostPictureTestTwinLayer
26 : public LayerTreeHostPictureTest { 26 : public LayerTreeHostPictureTest {
27 virtual void SetupTree() OVERRIDE { 27 virtual void SetupTree() override {
28 LayerTreeHostPictureTest::SetupTree(); 28 LayerTreeHostPictureTest::SetupTree();
29 29
30 scoped_refptr<FakePictureLayer> picture = 30 scoped_refptr<FakePictureLayer> picture =
31 FakePictureLayer::Create(&client_); 31 FakePictureLayer::Create(&client_);
32 layer_tree_host()->root_layer()->AddChild(picture); 32 layer_tree_host()->root_layer()->AddChild(picture);
33 } 33 }
34 34
35 virtual void BeginTest() OVERRIDE { 35 virtual void BeginTest() override {
36 activates_ = 0; 36 activates_ = 0;
37 PostSetNeedsCommitToMainThread(); 37 PostSetNeedsCommitToMainThread();
38 } 38 }
39 39
40 virtual void DidCommit() OVERRIDE { 40 virtual void DidCommit() override {
41 switch (layer_tree_host()->source_frame_number()) { 41 switch (layer_tree_host()->source_frame_number()) {
42 case 2: 42 case 2:
43 // Drop the picture layer from the tree. 43 // Drop the picture layer from the tree.
44 layer_tree_host()->root_layer()->children()[0]->RemoveFromParent(); 44 layer_tree_host()->root_layer()->children()[0]->RemoveFromParent();
45 break; 45 break;
46 case 3: 46 case 3:
47 // Add a new picture layer. 47 // Add a new picture layer.
48 scoped_refptr<FakePictureLayer> picture = 48 scoped_refptr<FakePictureLayer> picture =
49 FakePictureLayer::Create(&client_); 49 FakePictureLayer::Create(&client_);
50 layer_tree_host()->root_layer()->AddChild(picture); 50 layer_tree_host()->root_layer()->AddChild(picture);
51 break; 51 break;
52 } 52 }
53 } 53 }
54 54
55 virtual void WillActivateTreeOnThread(LayerTreeHostImpl* impl) OVERRIDE { 55 virtual void WillActivateTreeOnThread(LayerTreeHostImpl* impl) override {
56 LayerImpl* pending_root_impl = impl->pending_tree()->root_layer(); 56 LayerImpl* pending_root_impl = impl->pending_tree()->root_layer();
57 LayerImpl* active_root_impl = impl->active_tree()->root_layer(); 57 LayerImpl* active_root_impl = impl->active_tree()->root_layer();
58 58
59 if (pending_root_impl->children().empty()) { 59 if (pending_root_impl->children().empty()) {
60 EXPECT_EQ(2, activates_); 60 EXPECT_EQ(2, activates_);
61 return; 61 return;
62 } 62 }
63 63
64 FakePictureLayerImpl* pending_picture_impl = 64 FakePictureLayerImpl* pending_picture_impl =
65 static_cast<FakePictureLayerImpl*>(pending_root_impl->children()[0]); 65 static_cast<FakePictureLayerImpl*>(pending_root_impl->children()[0]);
(...skipping 15 matching lines...) Expand all
81 81
82 // After the first activation, when we commit again, we'll have a pending 82 // After the first activation, when we commit again, we'll have a pending
83 // and active layer. Then we recreate a picture layer in the 4th activate 83 // and active layer. Then we recreate a picture layer in the 4th activate
84 // and the next commit will have a pending and active twin again. 84 // and the next commit will have a pending and active twin again.
85 EXPECT_TRUE(activates_ == 1 || activates_ == 4); 85 EXPECT_TRUE(activates_ == 1 || activates_ == 4);
86 86
87 EXPECT_EQ(pending_picture_impl, active_picture_impl->twin_layer()); 87 EXPECT_EQ(pending_picture_impl, active_picture_impl->twin_layer());
88 EXPECT_EQ(active_picture_impl, pending_picture_impl->twin_layer()); 88 EXPECT_EQ(active_picture_impl, pending_picture_impl->twin_layer());
89 } 89 }
90 90
91 virtual void DidActivateTreeOnThread(LayerTreeHostImpl* impl) OVERRIDE { 91 virtual void DidActivateTreeOnThread(LayerTreeHostImpl* impl) override {
92 LayerImpl* active_root_impl = impl->active_tree()->root_layer(); 92 LayerImpl* active_root_impl = impl->active_tree()->root_layer();
93 93
94 if (active_root_impl->children().empty()) { 94 if (active_root_impl->children().empty()) {
95 EXPECT_EQ(2, activates_); 95 EXPECT_EQ(2, activates_);
96 } else { 96 } else {
97 FakePictureLayerImpl* active_picture_impl = 97 FakePictureLayerImpl* active_picture_impl =
98 static_cast<FakePictureLayerImpl*>(active_root_impl->children()[0]); 98 static_cast<FakePictureLayerImpl*>(active_root_impl->children()[0]);
99 99
100 EXPECT_EQ(NULL, active_picture_impl->twin_layer()); 100 EXPECT_EQ(NULL, active_picture_impl->twin_layer());
101 } 101 }
102 102
103 ++activates_; 103 ++activates_;
104 if (activates_ <= 4) 104 if (activates_ <= 4)
105 PostSetNeedsCommitToMainThread(); 105 PostSetNeedsCommitToMainThread();
106 else 106 else
107 EndTest(); 107 EndTest();
108 } 108 }
109 109
110 virtual void AfterTest() OVERRIDE {} 110 virtual void AfterTest() override {}
111 111
112 FakeContentLayerClient client_; 112 FakeContentLayerClient client_;
113 int activates_; 113 int activates_;
114 }; 114 };
115 115
116 MULTI_THREAD_TEST_F(LayerTreeHostPictureTestTwinLayer); 116 MULTI_THREAD_TEST_F(LayerTreeHostPictureTestTwinLayer);
117 117
118 } // namespace 118 } // namespace
119 } // namespace cc 119 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_occlusion.cc ('k') | cc/trees/layer_tree_host_unittest_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698