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

Side by Side Diff: cc/test/fake_layer_tree_host.cc

Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eraseandroid
Patch Set: Rebase. Created 4 years, 9 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/layers/video_layer.cc ('k') | cc/test/fake_layer_tree_host_impl.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "cc/test/fake_layer_tree_host.h" 5 #include "cc/test/fake_layer_tree_host.h"
6 6
7 #include "cc/layers/layer.h" 7 #include "cc/layers/layer.h"
8 #include "cc/test/fake_image_serialization_processor.h" 8 #include "cc/test/fake_image_serialization_processor.h"
9 #include "cc/test/test_task_graph_runner.h" 9 #include "cc/test/test_task_graph_runner.h"
10 10
(...skipping 13 matching lines...) Expand all
24 mode == CompositorMode::THREADED ? base::ThreadTaskRunnerHandle::Get() 24 mode == CompositorMode::THREADED ? base::ThreadTaskRunnerHandle::Get()
25 : nullptr; 25 : nullptr;
26 SetTaskRunnerProviderForTesting(TaskRunnerProvider::Create( 26 SetTaskRunnerProviderForTesting(TaskRunnerProvider::Create(
27 base::ThreadTaskRunnerHandle::Get(), impl_task_runner)); 27 base::ThreadTaskRunnerHandle::Get(), impl_task_runner));
28 client_->SetLayerTreeHost(this); 28 client_->SetLayerTreeHost(this);
29 } 29 }
30 30
31 scoped_ptr<FakeLayerTreeHost> FakeLayerTreeHost::Create( 31 scoped_ptr<FakeLayerTreeHost> FakeLayerTreeHost::Create(
32 FakeLayerTreeHostClient* client, 32 FakeLayerTreeHostClient* client,
33 TestTaskGraphRunner* task_graph_runner) { 33 TestTaskGraphRunner* task_graph_runner) {
34 LayerTreeSettings settings; 34 return Create(client, task_graph_runner, LayerTreeSettings());
35 settings.use_compositor_animation_timelines = true;
36 return Create(client, task_graph_runner, settings);
37 } 35 }
38 36
39 scoped_ptr<FakeLayerTreeHost> FakeLayerTreeHost::Create( 37 scoped_ptr<FakeLayerTreeHost> FakeLayerTreeHost::Create(
40 FakeLayerTreeHostClient* client, 38 FakeLayerTreeHostClient* client,
41 TestTaskGraphRunner* task_graph_runner, 39 TestTaskGraphRunner* task_graph_runner,
42 const LayerTreeSettings& settings) { 40 const LayerTreeSettings& settings) {
43 return Create(client, task_graph_runner, settings, 41 return Create(client, task_graph_runner, settings,
44 CompositorMode::SINGLE_THREADED); 42 CompositorMode::SINGLE_THREADED);
45 } 43 }
46 44
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 root_layer(), std::move(old_root_layer_impl), pending_tree()); 111 root_layer(), std::move(old_root_layer_impl), pending_tree());
114 pending_tree()->SetPropertyTrees(*property_trees()); 112 pending_tree()->SetPropertyTrees(*property_trees());
115 TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); 113 TreeSynchronizer::PushProperties(root_layer(), layer_impl.get());
116 114
117 pending_tree()->SetRootLayer(std::move(layer_impl)); 115 pending_tree()->SetRootLayer(std::move(layer_impl));
118 pending_tree()->UpdatePropertyTreeScrollOffset(property_trees()); 116 pending_tree()->UpdatePropertyTreeScrollOffset(property_trees());
119 return pending_tree()->root_layer(); 117 return pending_tree()->root_layer();
120 } 118 }
121 119
122 } // namespace cc 120 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/video_layer.cc ('k') | cc/test/fake_layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698