| 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/single_thread_proxy.h" | 5 #include "cc/trees/single_thread_proxy.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/profiler/scoped_tracker.h" | 9 #include "base/profiler/scoped_tracker.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 | 64 |
| 65 if (layer_tree_host_->settings().single_thread_proxy_scheduler && | 65 if (layer_tree_host_->settings().single_thread_proxy_scheduler && |
| 66 !scheduler_on_impl_thread_) { | 66 !scheduler_on_impl_thread_) { |
| 67 SchedulerSettings scheduler_settings( | 67 SchedulerSettings scheduler_settings( |
| 68 layer_tree_host_->settings().ToSchedulerSettings()); | 68 layer_tree_host_->settings().ToSchedulerSettings()); |
| 69 scheduler_settings.commit_to_active_tree = CommitToActiveTree(); | 69 scheduler_settings.commit_to_active_tree = CommitToActiveTree(); |
| 70 | 70 |
| 71 std::unique_ptr<CompositorTimingHistory> compositor_timing_history( | 71 std::unique_ptr<CompositorTimingHistory> compositor_timing_history( |
| 72 new CompositorTimingHistory( | 72 new CompositorTimingHistory( |
| 73 scheduler_settings.using_synchronous_renderer_compositor, | 73 scheduler_settings.using_synchronous_renderer_compositor, |
| 74 scheduler_settings.swap_ack_watchdog_enabled, |
| 74 CompositorTimingHistory::BROWSER_UMA, | 75 CompositorTimingHistory::BROWSER_UMA, |
| 75 layer_tree_host_->rendering_stats_instrumentation())); | 76 layer_tree_host_->rendering_stats_instrumentation())); |
| 76 | 77 |
| 77 BeginFrameSource* frame_source = nullptr; | 78 BeginFrameSource* frame_source = nullptr; |
| 78 if (!layer_tree_host_->settings().use_output_surface_begin_frame_source) { | 79 if (!layer_tree_host_->settings().use_output_surface_begin_frame_source) { |
| 79 frame_source = external_begin_frame_source_.get(); | 80 frame_source = external_begin_frame_source_.get(); |
| 80 if (!scheduler_settings.throttle_frame_production) { | 81 if (!scheduler_settings.throttle_frame_production) { |
| 81 // Unthrottled source takes precedence over external sources. | 82 // Unthrottled source takes precedence over external sources. |
| 82 unthrottled_begin_frame_source_.reset(new BackToBackBeginFrameSource( | 83 unthrottled_begin_frame_source_.reset(new BackToBackBeginFrameSource( |
| 83 base::MakeUnique<DelayBasedTimeSource>( | 84 base::MakeUnique<DelayBasedTimeSource>( |
| (...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 886 void SingleThreadProxy::DidFinishImplFrame() { | 887 void SingleThreadProxy::DidFinishImplFrame() { |
| 887 layer_tree_host_impl_->DidFinishImplFrame(); | 888 layer_tree_host_impl_->DidFinishImplFrame(); |
| 888 #if DCHECK_IS_ON() | 889 #if DCHECK_IS_ON() |
| 889 DCHECK(inside_impl_frame_) | 890 DCHECK(inside_impl_frame_) |
| 890 << "DidFinishImplFrame called while not inside an impl frame!"; | 891 << "DidFinishImplFrame called while not inside an impl frame!"; |
| 891 inside_impl_frame_ = false; | 892 inside_impl_frame_ = false; |
| 892 #endif | 893 #endif |
| 893 } | 894 } |
| 894 | 895 |
| 895 } // namespace cc | 896 } // namespace cc |
| OLD | NEW |