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

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

Issue 2340143002: cc: Rename LayerTreeHost to LayerTreeHostInProcess. (Closed)
Patch Set: comment fix Created 4 years, 3 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
« no previous file with comments | « cc/test/layer_tree_pixel_resource_test.cc ('k') | cc/test/layer_tree_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "cc/test/remote_proto_channel_bridge.h" 11 #include "cc/test/remote_proto_channel_bridge.h"
12 #include "cc/test/test_gpu_memory_buffer_manager.h" 12 #include "cc/test/test_gpu_memory_buffer_manager.h"
13 #include "cc/test/test_hooks.h" 13 #include "cc/test/test_hooks.h"
14 #include "cc/test/test_task_graph_runner.h" 14 #include "cc/test/test_task_graph_runner.h"
15 #include "cc/trees/layer_tree_host.h" 15 #include "cc/trees/compositor_mode.h"
16 #include "cc/trees/layer_tree_host_impl.h" 16 #include "cc/trees/layer_tree_host_impl.h"
17 #include "cc/trees/layer_tree_host_in_process.h"
17 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
18 19
19 namespace cc { 20 namespace cc {
20 class AnimationPlayer; 21 class AnimationPlayer;
21 class FakeLayerTreeHostClient; 22 class FakeLayerTreeHostClient;
22 class LayerImpl; 23 class LayerImpl;
23 class LayerTreeHost; 24 class LayerTreeHost;
24 class LayerTreeHostForTesting; 25 class LayerTreeHostForTesting;
25 class LayerTreeHostClient; 26 class LayerTreeHostClient;
26 class LayerTreeHostImpl; 27 class LayerTreeHostImpl;
27 class LayerTreeTestCompositorFrameSinkClient; 28 class LayerTreeTestCompositorFrameSinkClient;
29 class Proxy;
28 class ProxyImpl; 30 class ProxyImpl;
29 class ProxyMain; 31 class ProxyMain;
30 class RemoteChannelImplForTest; 32 class RemoteChannelImplForTest;
31 class TestContextProvider; 33 class TestContextProvider;
32 class TestCompositorFrameSink; 34 class TestCompositorFrameSink;
33 class TestGpuMemoryBufferManager; 35 class TestGpuMemoryBufferManager;
34 class TestTaskGraphRunner; 36 class TestTaskGraphRunner;
35 class TestWebGraphicsContext3D; 37 class TestWebGraphicsContext3D;
36 38
37 // Creates the virtual viewport layer hierarchy under the given root_layer. 39 // Creates the virtual viewport layer hierarchy under the given root_layer.
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 Proxy* proxy() const { 138 Proxy* proxy() const {
137 return layer_tree_host_ ? layer_tree_host_->proxy() : NULL; 139 return layer_tree_host_ ? layer_tree_host_->proxy() : NULL;
138 } 140 }
139 Proxy* remote_client_proxy() const; 141 Proxy* remote_client_proxy() const;
140 TaskRunnerProvider* task_runner_provider() const; 142 TaskRunnerProvider* task_runner_provider() const;
141 TaskGraphRunner* task_graph_runner() const { 143 TaskGraphRunner* task_graph_runner() const {
142 return task_graph_runner_.get(); 144 return task_graph_runner_.get();
143 } 145 }
144 bool TestEnded() const { return ended_; } 146 bool TestEnded() const { return ended_; }
145 147
146 LayerTreeHost* layer_tree_host(); 148 LayerTreeHostInProcess* layer_tree_host();
147 LayerTree* layer_tree() { return layer_tree_host()->GetLayerTree(); } 149 LayerTree* layer_tree() { return layer_tree_host()->GetLayerTree(); }
148 LayerTreeHost* remote_client_layer_tree_host(); 150 LayerTreeHost* remote_client_layer_tree_host();
149 SharedBitmapManager* shared_bitmap_manager() const { 151 SharedBitmapManager* shared_bitmap_manager() const {
150 return shared_bitmap_manager_.get(); 152 return shared_bitmap_manager_.get();
151 } 153 }
152 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager() { 154 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager() {
153 return gpu_memory_buffer_manager_.get(); 155 return gpu_memory_buffer_manager_.get();
154 } 156 }
155 157
156 void DestroyLayerTreeHost(); 158 void DestroyLayerTreeHost();
(...skipping 17 matching lines...) Expand all
174 bool IsRemoteTest() const; 176 bool IsRemoteTest() const;
175 177
176 gfx::Vector2dF ScrollDelta(LayerImpl* layer_impl); 178 gfx::Vector2dF ScrollDelta(LayerImpl* layer_impl);
177 179
178 private: 180 private:
179 LayerTreeSettings settings_; 181 LayerTreeSettings settings_;
180 182
181 CompositorMode mode_; 183 CompositorMode mode_;
182 184
183 std::unique_ptr<LayerTreeHostClientForTesting> client_; 185 std::unique_ptr<LayerTreeHostClientForTesting> client_;
184 std::unique_ptr<LayerTreeHost> layer_tree_host_; 186 std::unique_ptr<LayerTreeHostInProcess> layer_tree_host_;
185 187
186 // The LayerTreeHost created by the cc embedder on the client in remote mode. 188 // The LayerTreeHost created by the cc embedder on the client in remote mode.
187 std::unique_ptr<LayerTreeHostForTesting> remote_client_layer_tree_host_; 189 std::unique_ptr<LayerTreeHostForTesting> remote_client_layer_tree_host_;
188 190
189 RemoteProtoChannelBridge remote_proto_channel_bridge_; 191 RemoteProtoChannelBridge remote_proto_channel_bridge_;
190 192
191 std::unique_ptr<ImageSerializationProcessor> image_serialization_processor_; 193 std::unique_ptr<ImageSerializationProcessor> image_serialization_processor_;
192 194
193 bool beginning_ = false; 195 bool beginning_ = false;
194 bool end_when_begin_returns_ = false; 196 bool end_when_begin_returns_ = false;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \ 232 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \
231 SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME); \ 233 SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME); \
232 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) 234 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
233 235
234 // Some tests want to control when notify ready for activation occurs, 236 // Some tests want to control when notify ready for activation occurs,
235 // but this is not supported in the single-threaded case. 237 // but this is not supported in the single-threaded case.
236 #define MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \ 238 #define MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \
237 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) 239 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
238 240
239 #endif // CC_TEST_LAYER_TREE_TEST_H_ 241 #endif // CC_TEST_LAYER_TREE_TEST_H_
OLDNEW
« no previous file with comments | « cc/test/layer_tree_pixel_resource_test.cc ('k') | cc/test/layer_tree_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698