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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 int total_ui_resource_created_; | 96 int total_ui_resource_created_; |
97 int total_ui_resource_deleted_; | 97 int total_ui_resource_deleted_; |
98 }; | 98 }; |
99 | 99 |
100 class ScrollbarLayerTest : public testing::Test { | 100 class ScrollbarLayerTest : public testing::Test { |
101 public: | 101 public: |
102 ScrollbarLayerTest() { | 102 ScrollbarLayerTest() { |
103 layer_tree_settings_.single_thread_proxy_scheduler = false; | 103 layer_tree_settings_.single_thread_proxy_scheduler = false; |
104 layer_tree_settings_.use_zero_copy = true; | 104 layer_tree_settings_.use_zero_copy = true; |
105 layer_tree_settings_.scrollbar_animator = LayerTreeSettings::LINEAR_FADE; | 105 layer_tree_settings_.scrollbar_animator = LayerTreeSettings::LINEAR_FADE; |
106 layer_tree_settings_.scrollbar_fade_delay_ms = 20; | 106 layer_tree_settings_.scrollbar_fade_delay = |
107 layer_tree_settings_.scrollbar_fade_duration_ms = 20; | 107 base::TimeDelta::FromMilliseconds(20); |
| 108 layer_tree_settings_.scrollbar_fade_duration = |
| 109 base::TimeDelta::FromMilliseconds(20); |
108 layer_tree_settings_.verify_transform_tree_calculations = true; | 110 layer_tree_settings_.verify_transform_tree_calculations = true; |
109 layer_tree_settings_.verify_clip_tree_calculations = true; | 111 layer_tree_settings_.verify_clip_tree_calculations = true; |
110 | 112 |
111 scrollbar_layer_id_ = -1; | 113 scrollbar_layer_id_ = -1; |
112 | 114 |
113 LayerTreeHostInProcess::InitParams params; | 115 LayerTreeHostInProcess::InitParams params; |
114 params.client = &fake_client_; | 116 params.client = &fake_client_; |
115 params.settings = &layer_tree_settings_; | 117 params.settings = &layer_tree_settings_; |
116 params.task_graph_runner = &task_graph_runner_; | 118 params.task_graph_runner = &task_graph_runner_; |
117 params.animation_host = | 119 params.animation_host = |
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1119 TestScale(gfx::Rect(1240, 0, 15, 1333), 2.7754839f); | 1121 TestScale(gfx::Rect(1240, 0, 15, 1333), 2.7754839f); |
1120 TestScale(gfx::Rect(1240, 0, 15, 677), 2.46677136f); | 1122 TestScale(gfx::Rect(1240, 0, 15, 677), 2.46677136f); |
1121 | 1123 |
1122 // Horizontal Scrollbars. | 1124 // Horizontal Scrollbars. |
1123 TestScale(gfx::Rect(0, 1240, 1333, 15), 2.7754839f); | 1125 TestScale(gfx::Rect(0, 1240, 1333, 15), 2.7754839f); |
1124 TestScale(gfx::Rect(0, 1240, 677, 15), 2.46677136f); | 1126 TestScale(gfx::Rect(0, 1240, 677, 15), 2.46677136f); |
1125 } | 1127 } |
1126 | 1128 |
1127 } // namespace | 1129 } // namespace |
1128 } // namespace cc | 1130 } // namespace cc |
OLD | NEW |