| 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 <GLES2/gl2.h> | 7 #include <GLES2/gl2.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <limits> | 9 #include <limits> |
| 10 | 10 |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 max_staging_buffer_usage_in_bytes = proto.max_staging_buffer_usage_in_bytes(); | 306 max_staging_buffer_usage_in_bytes = proto.max_staging_buffer_usage_in_bytes(); |
| 307 memory_policy_.FromProtobuf(proto.memory_policy()); | 307 memory_policy_.FromProtobuf(proto.memory_policy()); |
| 308 initial_debug_state.FromProtobuf(proto.initial_debug_state()); | 308 initial_debug_state.FromProtobuf(proto.initial_debug_state()); |
| 309 | 309 |
| 310 for (int i = 0; i < proto.use_image_texture_targets_size(); ++i) | 310 for (int i = 0; i < proto.use_image_texture_targets_size(); ++i) |
| 311 use_image_texture_targets.push_back(proto.use_image_texture_targets(i)); | 311 use_image_texture_targets.push_back(proto.use_image_texture_targets(i)); |
| 312 } | 312 } |
| 313 | 313 |
| 314 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const { | 314 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const { |
| 315 SchedulerSettings scheduler_settings; | 315 SchedulerSettings scheduler_settings; |
| 316 // TODO(fsamuel): We don't support external BeginFrame in an embedded |
| 317 // GuestView yet. We need to fix this for upstreaming. |
| 316 scheduler_settings.use_external_begin_frame_source = | 318 scheduler_settings.use_external_begin_frame_source = |
| 317 use_external_begin_frame_source; | 319 false; // use_external_begin_frame_source; |
| 318 scheduler_settings.main_frame_before_activation_enabled = | 320 scheduler_settings.main_frame_before_activation_enabled = |
| 319 main_frame_before_activation_enabled; | 321 main_frame_before_activation_enabled; |
| 320 scheduler_settings.timeout_and_draw_when_animation_checkerboards = | 322 scheduler_settings.timeout_and_draw_when_animation_checkerboards = |
| 321 timeout_and_draw_when_animation_checkerboards; | 323 timeout_and_draw_when_animation_checkerboards; |
| 322 scheduler_settings.using_synchronous_renderer_compositor = | 324 scheduler_settings.using_synchronous_renderer_compositor = |
| 323 using_synchronous_renderer_compositor; | 325 using_synchronous_renderer_compositor; |
| 324 scheduler_settings.throttle_frame_production = wait_for_beginframe_interval; | 326 scheduler_settings.throttle_frame_production = wait_for_beginframe_interval; |
| 325 scheduler_settings.background_frame_interval = | 327 scheduler_settings.background_frame_interval = |
| 326 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate); | 328 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate); |
| 327 return scheduler_settings; | 329 return scheduler_settings; |
| 328 } | 330 } |
| 329 | 331 |
| 330 } // namespace cc | 332 } // namespace cc |
| OLD | NEW |