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

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

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 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 return layer_tree_host_ ? layer_tree_host_->proxy() : NULL; 137 return layer_tree_host_ ? layer_tree_host_->proxy() : NULL;
138 } 138 }
139 Proxy* remote_client_proxy() const; 139 Proxy* remote_client_proxy() const;
140 TaskRunnerProvider* task_runner_provider() const; 140 TaskRunnerProvider* task_runner_provider() const;
141 TaskGraphRunner* task_graph_runner() const { 141 TaskGraphRunner* task_graph_runner() const {
142 return task_graph_runner_.get(); 142 return task_graph_runner_.get();
143 } 143 }
144 bool TestEnded() const { return ended_; } 144 bool TestEnded() const { return ended_; }
145 145
146 LayerTreeHost* layer_tree_host(); 146 LayerTreeHost* layer_tree_host();
147 LayerTree* layer_tree() { return layer_tree_host()->GetLayerTree(); }
147 LayerTreeHost* remote_client_layer_tree_host(); 148 LayerTreeHost* remote_client_layer_tree_host();
148 SharedBitmapManager* shared_bitmap_manager() const { 149 SharedBitmapManager* shared_bitmap_manager() const {
149 return shared_bitmap_manager_.get(); 150 return shared_bitmap_manager_.get();
150 } 151 }
151 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager() { 152 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager() {
152 return gpu_memory_buffer_manager_.get(); 153 return gpu_memory_buffer_manager_.get();
153 } 154 }
154 155
155 void DestroyLayerTreeHost(); 156 void DestroyLayerTreeHost();
156 void DestroyRemoteClientHost() override; 157 void DestroyRemoteClientHost() override;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \ 235 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \
235 SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME); \ 236 SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME); \
236 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) 237 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
237 238
238 // Some tests want to control when notify ready for activation occurs, 239 // Some tests want to control when notify ready for activation occurs,
239 // but this is not supported in the single-threaded case. 240 // but this is not supported in the single-threaded case.
240 #define MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \ 241 #define MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \
241 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) 242 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
242 243
243 #endif // CC_TEST_LAYER_TREE_TEST_H_ 244 #endif // CC_TEST_LAYER_TREE_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698