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

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

Issue 645853008: Standardize usage of virtual/override/final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatted 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 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 #include "cc/test/layer_tree_test.h" 7 #include "cc/test/layer_tree_test.h"
8 #include "cc/trees/thread_proxy.h" 8 #include "cc/trees/thread_proxy.h"
9 9
10 #define THREAD_PROXY_NO_IMPL_TEST_F(TEST_FIXTURE_NAME) \ 10 #define THREAD_PROXY_NO_IMPL_TEST_F(TEST_FIXTURE_NAME) \
(...skipping 19 matching lines...) Expand all
30 ProxyTest() {} 30 ProxyTest() {}
31 virtual ~ProxyTest() {} 31 virtual ~ProxyTest() {}
32 32
33 void Run(bool threaded, bool impl_side_painting) { 33 void Run(bool threaded, bool impl_side_painting) {
34 // We don't need to care about delegating mode. 34 // We don't need to care about delegating mode.
35 bool delegating_renderer = true; 35 bool delegating_renderer = true;
36 36
37 RunTest(threaded, delegating_renderer, impl_side_painting); 37 RunTest(threaded, delegating_renderer, impl_side_painting);
38 } 38 }
39 39
40 virtual void BeginTest() override {} 40 void BeginTest() override {}
41 virtual void AfterTest() override {} 41 void AfterTest() override {}
42 42
43 private: 43 private:
44 DISALLOW_COPY_AND_ASSIGN(ProxyTest); 44 DISALLOW_COPY_AND_ASSIGN(ProxyTest);
45 }; 45 };
46 46
47 class ProxyTestScheduledActionsBasic : public ProxyTest { 47 class ProxyTestScheduledActionsBasic : public ProxyTest {
48 protected: 48 protected:
49 virtual void BeginTest() override { 49 void BeginTest() override { proxy()->SetNeedsCommit(); }
50 proxy()->SetNeedsCommit();
51 }
52 50
53 virtual void ScheduledActionBeginOutputSurfaceCreation() override { 51 void ScheduledActionBeginOutputSurfaceCreation() override {
54 EXPECT_EQ(0, action_phase_++); 52 EXPECT_EQ(0, action_phase_++);
55 } 53 }
56 54
57 virtual void ScheduledActionSendBeginMainFrame() override { 55 void ScheduledActionSendBeginMainFrame() override {
58 EXPECT_EQ(1, action_phase_++); 56 EXPECT_EQ(1, action_phase_++);
59 } 57 }
60 58
61 virtual void ScheduledActionCommit() override { 59 void ScheduledActionCommit() override { EXPECT_EQ(2, action_phase_++); }
62 EXPECT_EQ(2, action_phase_++);
63 }
64 60
65 virtual void ScheduledActionDrawAndSwapIfPossible() override { 61 void ScheduledActionDrawAndSwapIfPossible() override {
66 EXPECT_EQ(3, action_phase_++); 62 EXPECT_EQ(3, action_phase_++);
67 EndTest(); 63 EndTest();
68 } 64 }
69 65
70 virtual void AfterTest() override { 66 void AfterTest() override { EXPECT_EQ(4, action_phase_); }
71 EXPECT_EQ(4, action_phase_);
72 }
73 67
74 ProxyTestScheduledActionsBasic() : action_phase_(0) { 68 ProxyTestScheduledActionsBasic() : action_phase_(0) {
75 } 69 }
76 virtual ~ProxyTestScheduledActionsBasic() {} 70 virtual ~ProxyTestScheduledActionsBasic() {}
77 71
78 private: 72 private:
79 int action_phase_; 73 int action_phase_;
80 74
81 DISALLOW_COPY_AND_ASSIGN(ProxyTestScheduledActionsBasic); 75 DISALLOW_COPY_AND_ASSIGN(ProxyTestScheduledActionsBasic);
82 }; 76 };
(...skipping 19 matching lines...) Expand all
102 96
103 private: 97 private:
104 DISALLOW_COPY_AND_ASSIGN(ThreadProxyTest); 98 DISALLOW_COPY_AND_ASSIGN(ThreadProxyTest);
105 }; 99 };
106 100
107 class ThreadProxyTestSetNeedsCommit : public ThreadProxyTest { 101 class ThreadProxyTestSetNeedsCommit : public ThreadProxyTest {
108 protected: 102 protected:
109 ThreadProxyTestSetNeedsCommit() {} 103 ThreadProxyTestSetNeedsCommit() {}
110 virtual ~ThreadProxyTestSetNeedsCommit() {} 104 virtual ~ThreadProxyTestSetNeedsCommit() {}
111 105
112 virtual void BeginTest() override { 106 void BeginTest() override {
113 EXPECT_FALSE(ThreadProxyMainOnly().commit_requested); 107 EXPECT_FALSE(ThreadProxyMainOnly().commit_requested);
114 EXPECT_FALSE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread); 108 EXPECT_FALSE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread);
115 109
116 proxy()->SetNeedsCommit(); 110 proxy()->SetNeedsCommit();
117 111
118 EXPECT_TRUE(ThreadProxyMainOnly().commit_requested); 112 EXPECT_TRUE(ThreadProxyMainOnly().commit_requested);
119 EXPECT_TRUE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread); 113 EXPECT_TRUE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread);
120 } 114 }
121 115
122 virtual void DidBeginMainFrame() override { 116 void DidBeginMainFrame() override {
123 EXPECT_FALSE(ThreadProxyMainOnly().commit_requested); 117 EXPECT_FALSE(ThreadProxyMainOnly().commit_requested);
124 EXPECT_FALSE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread); 118 EXPECT_FALSE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread);
125 119
126 EndTest(); 120 EndTest();
127 } 121 }
128 122
129 private: 123 private:
130 DISALLOW_COPY_AND_ASSIGN(ThreadProxyTestSetNeedsCommit); 124 DISALLOW_COPY_AND_ASSIGN(ThreadProxyTestSetNeedsCommit);
131 }; 125 };
132 126
133 THREAD_PROXY_TEST_F(ThreadProxyTestSetNeedsCommit); 127 THREAD_PROXY_TEST_F(ThreadProxyTestSetNeedsCommit);
134 128
135 } // namespace cc 129 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_picture.cc ('k') | cc/trees/layer_tree_host_unittest_scroll.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698