OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include <unordered_map> | 7 #include <unordered_map> |
8 | 8 |
9 #include "base/threading/thread_task_runner_handle.h" | 9 #include "base/threading/thread_task_runner_handle.h" |
10 #include "cc/animation/animation_host.h" | 10 #include "cc/animation/animation_host.h" |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 | 111 |
112 scrollbar_layer_id_ = -1; | 112 scrollbar_layer_id_ = -1; |
113 | 113 |
114 animation_host_ = AnimationHost::CreateForTesting(ThreadInstance::MAIN); | 114 animation_host_ = AnimationHost::CreateForTesting(ThreadInstance::MAIN); |
115 | 115 |
116 LayerTreeHostInProcess::InitParams params; | 116 LayerTreeHostInProcess::InitParams params; |
117 params.client = &fake_client_; | 117 params.client = &fake_client_; |
118 params.settings = &layer_tree_settings_; | 118 params.settings = &layer_tree_settings_; |
119 params.task_graph_runner = &task_graph_runner_; | 119 params.task_graph_runner = &task_graph_runner_; |
120 params.mutator_host = animation_host_.get(); | 120 params.mutator_host = animation_host_.get(); |
| 121 params.image_worker_task_runner = nullptr; |
121 | 122 |
122 std::unique_ptr<FakeResourceTrackingUIResourceManager> | 123 std::unique_ptr<FakeResourceTrackingUIResourceManager> |
123 fake_ui_resource_manager = | 124 fake_ui_resource_manager = |
124 base::MakeUnique<FakeResourceTrackingUIResourceManager>(); | 125 base::MakeUnique<FakeResourceTrackingUIResourceManager>(); |
125 fake_ui_resource_manager_ = fake_ui_resource_manager.get(); | 126 fake_ui_resource_manager_ = fake_ui_resource_manager.get(); |
126 | 127 |
127 layer_tree_host_.reset(new FakeLayerTreeHost( | 128 layer_tree_host_.reset(new FakeLayerTreeHost( |
128 &fake_client_, ¶ms, CompositorMode::SINGLE_THREADED)); | 129 &fake_client_, ¶ms, CompositorMode::SINGLE_THREADED)); |
129 layer_tree_host_->SetUIResourceManagerForTesting( | 130 layer_tree_host_->SetUIResourceManagerForTesting( |
130 std::move(fake_ui_resource_manager)); | 131 std::move(fake_ui_resource_manager)); |
(...skipping 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1169 TestScale(gfx::Rect(1240, 0, 15, 1333), 2.7754839f); | 1170 TestScale(gfx::Rect(1240, 0, 15, 1333), 2.7754839f); |
1170 TestScale(gfx::Rect(1240, 0, 15, 677), 2.46677136f); | 1171 TestScale(gfx::Rect(1240, 0, 15, 677), 2.46677136f); |
1171 | 1172 |
1172 // Horizontal Scrollbars. | 1173 // Horizontal Scrollbars. |
1173 TestScale(gfx::Rect(0, 1240, 1333, 15), 2.7754839f); | 1174 TestScale(gfx::Rect(0, 1240, 1333, 15), 2.7754839f); |
1174 TestScale(gfx::Rect(0, 1240, 677, 15), 2.46677136f); | 1175 TestScale(gfx::Rect(0, 1240, 677, 15), 2.46677136f); |
1175 } | 1176 } |
1176 | 1177 |
1177 } // namespace | 1178 } // namespace |
1178 } // namespace cc | 1179 } // namespace cc |
OLD | NEW |