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

Unified Diff: cc/layers/layer_unittest.cc

Issue 1177033008: cc: Turn impl_side_painting and use_one_copy on in LayerTreeSettings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: implon: fixwebkittests Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/layer_position_constraint_unittest.cc ('k') | cc/layers/nine_patch_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 61d933345215d94134a23f7d59d6898cbcbba677..3aa8da936e12a04ceae8bc325fed6efd8aa0cb94 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -73,6 +73,7 @@ class LayerTest : public testing::Test {
LayerTreeSettings settings;
params.client = &fake_client_;
params.settings = &settings;
+ params.task_graph_runner = &task_graph_runner_;
layer_tree_host_.reset(
new StrictMock<MockLayerTreeHost>(&fake_client_, &params));
}
@@ -941,18 +942,16 @@ TEST_F(LayerTest, TranformIsInvertibleAnimation) {
class LayerTreeHostFactory {
public:
- LayerTreeHostFactory()
- : client_(FakeLayerTreeHostClient::DIRECT_3D),
- shared_bitmap_manager_(new TestSharedBitmapManager),
- gpu_memory_buffer_manager_(new TestGpuMemoryBufferManager) {}
+ LayerTreeHostFactory() : client_(FakeLayerTreeHostClient::DIRECT_3D) {}
scoped_ptr<LayerTreeHost> Create() { return Create(LayerTreeSettings()); }
scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) {
LayerTreeHost::InitParams params;
params.client = &client_;
- params.shared_bitmap_manager = shared_bitmap_manager_.get();
- params.gpu_memory_buffer_manager = gpu_memory_buffer_manager_.get();
+ params.shared_bitmap_manager = &shared_bitmap_manager_;
+ params.task_graph_runner = &task_graph_runner_;
+ params.gpu_memory_buffer_manager = &gpu_memory_buffer_manager_;
params.settings = &settings;
params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
return LayerTreeHost::CreateSingleThreaded(&client_, &params);
@@ -960,8 +959,9 @@ class LayerTreeHostFactory {
private:
FakeLayerTreeHostClient client_;
- scoped_ptr<TestSharedBitmapManager> shared_bitmap_manager_;
- scoped_ptr<TestGpuMemoryBufferManager> gpu_memory_buffer_manager_;
+ TestSharedBitmapManager shared_bitmap_manager_;
+ TestTaskGraphRunner task_graph_runner_;
+ TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
};
void AssertLayerTreeHostMatchesForSubtree(Layer* layer, LayerTreeHost* host) {
« no previous file with comments | « cc/layers/layer_position_constraint_unittest.cc ('k') | cc/layers/nine_patch_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698