| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 use_partial_raster == other.use_partial_raster && | 69 use_partial_raster == other.use_partial_raster && |
| 70 enable_elastic_overscroll == other.enable_elastic_overscroll && | 70 enable_elastic_overscroll == other.enable_elastic_overscroll && |
| 71 ignore_root_layer_flings == other.ignore_root_layer_flings && | 71 ignore_root_layer_flings == other.ignore_root_layer_flings && |
| 72 scheduled_raster_task_limit == other.scheduled_raster_task_limit && | 72 scheduled_raster_task_limit == other.scheduled_raster_task_limit && |
| 73 use_occlusion_for_tile_prioritization == | 73 use_occlusion_for_tile_prioritization == |
| 74 other.use_occlusion_for_tile_prioritization && | 74 other.use_occlusion_for_tile_prioritization && |
| 75 verify_clip_tree_calculations == other.verify_clip_tree_calculations && | 75 verify_clip_tree_calculations == other.verify_clip_tree_calculations && |
| 76 verify_transform_tree_calculations == | 76 verify_transform_tree_calculations == |
| 77 other.verify_transform_tree_calculations && | 77 other.verify_transform_tree_calculations && |
| 78 image_decode_tasks_enabled == other.image_decode_tasks_enabled && | 78 image_decode_tasks_enabled == other.image_decode_tasks_enabled && |
| 79 wait_for_beginframe_interval == other.wait_for_beginframe_interval && | |
| 80 max_staging_buffer_usage_in_bytes == | 79 max_staging_buffer_usage_in_bytes == |
| 81 other.max_staging_buffer_usage_in_bytes && | 80 other.max_staging_buffer_usage_in_bytes && |
| 82 memory_policy_ == other.memory_policy_ && | 81 memory_policy_ == other.memory_policy_ && |
| 83 LayerTreeDebugState::Equal(initial_debug_state, | 82 LayerTreeDebugState::Equal(initial_debug_state, |
| 84 other.initial_debug_state) && | 83 other.initial_debug_state) && |
| 85 use_cached_picture_raster == other.use_cached_picture_raster; | 84 use_cached_picture_raster == other.use_cached_picture_raster; |
| 86 } | 85 } |
| 87 | 86 |
| 88 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const { | 87 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const { |
| 89 SchedulerSettings scheduler_settings; | 88 SchedulerSettings scheduler_settings; |
| 90 scheduler_settings.use_external_begin_frame_source = | |
| 91 use_external_begin_frame_source; | |
| 92 scheduler_settings.main_frame_before_activation_enabled = | 89 scheduler_settings.main_frame_before_activation_enabled = |
| 93 main_frame_before_activation_enabled; | 90 main_frame_before_activation_enabled; |
| 94 scheduler_settings.timeout_and_draw_when_animation_checkerboards = | 91 scheduler_settings.timeout_and_draw_when_animation_checkerboards = |
| 95 timeout_and_draw_when_animation_checkerboards; | 92 timeout_and_draw_when_animation_checkerboards; |
| 96 scheduler_settings.using_synchronous_renderer_compositor = | 93 scheduler_settings.using_synchronous_renderer_compositor = |
| 97 using_synchronous_renderer_compositor; | 94 using_synchronous_renderer_compositor; |
| 98 scheduler_settings.throttle_frame_production = wait_for_beginframe_interval; | |
| 99 scheduler_settings.background_frame_interval = | 95 scheduler_settings.background_frame_interval = |
| 100 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate); | 96 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate); |
| 101 scheduler_settings.abort_commit_before_output_surface_creation = | 97 scheduler_settings.abort_commit_before_output_surface_creation = |
| 102 abort_commit_before_output_surface_creation; | 98 abort_commit_before_output_surface_creation; |
| 103 return scheduler_settings; | 99 return scheduler_settings; |
| 104 } | 100 } |
| 105 | 101 |
| 106 } // namespace cc | 102 } // namespace cc |
| OLD | NEW |