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

Side by Side Diff: cc/test/layer_tree_test.h

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating fix. 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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 #ifndef CC_TEST_LAYER_TREE_TEST_H_ 5 #ifndef CC_TEST_LAYER_TREE_TEST_H_
6 #define CC_TEST_LAYER_TREE_TEST_H_ 6 #define CC_TEST_LAYER_TREE_TEST_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/threading/thread.h" 9 #include "base/threading/thread.h"
10 #include "cc/animation/animation_delegate.h" 10 #include "cc/animation/animation_delegate.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 bool HasImplThread() { return proxy() ? proxy()->HasImplThread() : false; } 167 bool HasImplThread() { return proxy() ? proxy()->HasImplThread() : false; }
168 base::SingleThreadTaskRunner* ImplThreadTaskRunner() { 168 base::SingleThreadTaskRunner* ImplThreadTaskRunner() {
169 DCHECK(proxy()); 169 DCHECK(proxy());
170 return proxy()->ImplThreadTaskRunner() ? proxy()->ImplThreadTaskRunner() 170 return proxy()->ImplThreadTaskRunner() ? proxy()->ImplThreadTaskRunner()
171 : main_task_runner_.get(); 171 : main_task_runner_.get();
172 } 172 }
173 base::SingleThreadTaskRunner* MainThreadTaskRunner() { 173 base::SingleThreadTaskRunner* MainThreadTaskRunner() {
174 return main_task_runner_.get(); 174 return main_task_runner_.get();
175 } 175 }
176 Proxy* proxy() const { 176 Proxy* proxy() const {
177 return layer_tree_host_ ? layer_tree_host_->proxy() : NULL; 177 return layer_tree_host_ ? layer_tree_host_->proxy() : nullptr;
178 } 178 }
179 179
180 bool TestEnded() const { return ended_; } 180 bool TestEnded() const { return ended_; }
181 181
182 LayerTreeHost* layer_tree_host() { return layer_tree_host_.get(); } 182 LayerTreeHost* layer_tree_host() { return layer_tree_host_.get(); }
183 bool delegating_renderer() const { return delegating_renderer_; } 183 bool delegating_renderer() const { return delegating_renderer_; }
184 FakeOutputSurface* output_surface() { return output_surface_; } 184 FakeOutputSurface* output_surface() { return output_surface_; }
185 int LastCommittedSourceFrameNumber(LayerTreeHostImpl* impl) const; 185 int LastCommittedSourceFrameNumber(LayerTreeHostImpl* impl) const;
186 186
187 void DestroyLayerTreeHost(); 187 void DestroyLayerTreeHost();
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \ 319 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
320 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) 320 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
321 321
322 // Some tests want to control when notify ready for activation occurs, 322 // Some tests want to control when notify ready for activation occurs,
323 // but this is not supported in the single-threaded case. 323 // but this is not supported in the single-threaded case.
324 #define SINGLE_AND_MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \ 324 #define SINGLE_AND_MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \
325 SINGLE_THREAD_NOIMPL_TEST_F(TEST_FIXTURE_NAME); \ 325 SINGLE_THREAD_NOIMPL_TEST_F(TEST_FIXTURE_NAME); \
326 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) 326 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
327 327
328 #endif // CC_TEST_LAYER_TREE_TEST_H_ 328 #endif // CC_TEST_LAYER_TREE_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698