| OLD | NEW |
|---|
| 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 #include "cc/trees/layer_tree_settings.h" | 5 #include "cc/trees/layer_tree_settings.h" |
| 6 | 6 |
| 7 #include "cc/proto/gfx_conversions.h" | 7 #include "cc/proto/gfx_conversions.h" |
| 8 #include "third_party/khronos/GLES2/gl2.h" | 8 #include "third_party/khronos/GLES2/gl2.h" |
| 9 | 9 |
| 10 namespace cc { | 10 namespace cc { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 bool LayerTreeSettings::operator==(const LayerTreeSettings& other) const { | 26 bool LayerTreeSettings::operator==(const LayerTreeSettings& other) const { |
| 27 return renderer_settings == other.renderer_settings && | 27 return renderer_settings == other.renderer_settings && |
| 28 single_thread_proxy_scheduler == other.single_thread_proxy_scheduler && | 28 single_thread_proxy_scheduler == other.single_thread_proxy_scheduler && |
| 29 use_external_begin_frame_source == | 29 use_external_begin_frame_source == |
| 30 other.use_external_begin_frame_source && | 30 other.use_external_begin_frame_source && |
| 31 main_frame_before_activation_enabled == | 31 main_frame_before_activation_enabled == |
| 32 other.main_frame_before_activation_enabled && | 32 other.main_frame_before_activation_enabled && |
| 33 using_synchronous_renderer_compositor == | 33 using_synchronous_renderer_compositor == |
| 34 other.using_synchronous_renderer_compositor && | 34 other.using_synchronous_renderer_compositor && |
| 35 enable_latency_recovery == other.enable_latency_recovery && |
| 35 can_use_lcd_text == other.can_use_lcd_text && | 36 can_use_lcd_text == other.can_use_lcd_text && |
| 36 use_distance_field_text == other.use_distance_field_text && | 37 use_distance_field_text == other.use_distance_field_text && |
| 37 gpu_rasterization_enabled == other.gpu_rasterization_enabled && | 38 gpu_rasterization_enabled == other.gpu_rasterization_enabled && |
| 38 gpu_rasterization_forced == other.gpu_rasterization_forced && | 39 gpu_rasterization_forced == other.gpu_rasterization_forced && |
| 39 async_worker_context_enabled == other.async_worker_context_enabled && | 40 async_worker_context_enabled == other.async_worker_context_enabled && |
| 40 gpu_rasterization_msaa_sample_count == | 41 gpu_rasterization_msaa_sample_count == |
| 41 other.gpu_rasterization_msaa_sample_count && | 42 other.gpu_rasterization_msaa_sample_count && |
| 42 create_low_res_tiling == other.create_low_res_tiling && | 43 create_low_res_tiling == other.create_low_res_tiling && |
| 43 scrollbar_animator == other.scrollbar_animator && | 44 scrollbar_animator == other.scrollbar_animator && |
| 44 scrollbar_fade_delay_ms == other.scrollbar_fade_delay_ms && | 45 scrollbar_fade_delay_ms == other.scrollbar_fade_delay_ms && |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 } | 90 } |
| 90 | 91 |
| 91 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const { | 92 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const { |
| 92 SchedulerSettings scheduler_settings; | 93 SchedulerSettings scheduler_settings; |
| 93 scheduler_settings.main_frame_before_activation_enabled = | 94 scheduler_settings.main_frame_before_activation_enabled = |
| 94 main_frame_before_activation_enabled; | 95 main_frame_before_activation_enabled; |
| 95 scheduler_settings.timeout_and_draw_when_animation_checkerboards = | 96 scheduler_settings.timeout_and_draw_when_animation_checkerboards = |
| 96 timeout_and_draw_when_animation_checkerboards; | 97 timeout_and_draw_when_animation_checkerboards; |
| 97 scheduler_settings.using_synchronous_renderer_compositor = | 98 scheduler_settings.using_synchronous_renderer_compositor = |
| 98 using_synchronous_renderer_compositor; | 99 using_synchronous_renderer_compositor; |
| 100 scheduler_settings.enable_latency_recovery = enable_latency_recovery; |
| 99 scheduler_settings.background_frame_interval = | 101 scheduler_settings.background_frame_interval = |
| 100 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate); | 102 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate); |
| 101 scheduler_settings.abort_commit_before_compositor_frame_sink_creation = | 103 scheduler_settings.abort_commit_before_compositor_frame_sink_creation = |
| 102 abort_commit_before_compositor_frame_sink_creation; | 104 abort_commit_before_compositor_frame_sink_creation; |
| 103 return scheduler_settings; | 105 return scheduler_settings; |
| 104 } | 106 } |
| 105 | 107 |
| 106 } // namespace cc | 108 } // namespace cc |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2354673003:
Add setting to disable latency recovery for tests (Closed)
