| 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 SchedulerSettings scheduler_settings; | 88 SchedulerSettings scheduler_settings; |
| 89 scheduler_settings.main_frame_before_activation_enabled = | 89 scheduler_settings.main_frame_before_activation_enabled = |
| 90 main_frame_before_activation_enabled; | 90 main_frame_before_activation_enabled; |
| 91 scheduler_settings.timeout_and_draw_when_animation_checkerboards = | 91 scheduler_settings.timeout_and_draw_when_animation_checkerboards = |
| 92 timeout_and_draw_when_animation_checkerboards; | 92 timeout_and_draw_when_animation_checkerboards; |
| 93 scheduler_settings.using_synchronous_renderer_compositor = | 93 scheduler_settings.using_synchronous_renderer_compositor = |
| 94 using_synchronous_renderer_compositor; | 94 using_synchronous_renderer_compositor; |
| 95 scheduler_settings.enable_latency_recovery = enable_latency_recovery; | 95 scheduler_settings.enable_latency_recovery = enable_latency_recovery; |
| 96 scheduler_settings.background_frame_interval = | 96 scheduler_settings.background_frame_interval = |
| 97 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate); | 97 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate); |
| 98 scheduler_settings.abort_commit_before_compositor_frame_sink_creation = | |
| 99 abort_commit_before_compositor_frame_sink_creation; | |
| 100 return scheduler_settings; | 98 return scheduler_settings; |
| 101 } | 99 } |
| 102 | 100 |
| 103 } // namespace cc | 101 } // namespace cc |
| OLD | NEW |