OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/proxy_impl.h" | 5 #include "cc/trees/proxy_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 DCHECK(!smoothness_priority_expiration_notifier_.delay().is_zero()); | 67 DCHECK(!smoothness_priority_expiration_notifier_.delay().is_zero()); |
68 | 68 |
69 layer_tree_host_impl_ = layer_tree_host->CreateLayerTreeHostImpl(this); | 69 layer_tree_host_impl_ = layer_tree_host->CreateLayerTreeHostImpl(this); |
70 | 70 |
71 SchedulerSettings scheduler_settings( | 71 SchedulerSettings scheduler_settings( |
72 layer_tree_host->settings().ToSchedulerSettings()); | 72 layer_tree_host->settings().ToSchedulerSettings()); |
73 | 73 |
74 std::unique_ptr<CompositorTimingHistory> compositor_timing_history( | 74 std::unique_ptr<CompositorTimingHistory> compositor_timing_history( |
75 new CompositorTimingHistory( | 75 new CompositorTimingHistory( |
76 scheduler_settings.using_synchronous_renderer_compositor, | 76 scheduler_settings.using_synchronous_renderer_compositor, |
| 77 scheduler_settings.swap_ack_watchdog_enabled, |
77 CompositorTimingHistory::RENDERER_UMA, | 78 CompositorTimingHistory::RENDERER_UMA, |
78 rendering_stats_instrumentation_)); | 79 rendering_stats_instrumentation_)); |
79 | 80 |
80 BeginFrameSource* frame_source = external_begin_frame_source_.get(); | 81 BeginFrameSource* frame_source = external_begin_frame_source_.get(); |
81 if (!scheduler_settings.throttle_frame_production) { | 82 if (!scheduler_settings.throttle_frame_production) { |
82 // Unthrottled source takes precedence over external sources. | 83 // Unthrottled source takes precedence over external sources. |
83 unthrottled_begin_frame_source_.reset( | 84 unthrottled_begin_frame_source_.reset( |
84 new BackToBackBeginFrameSource(base::MakeUnique<DelayBasedTimeSource>( | 85 new BackToBackBeginFrameSource(base::MakeUnique<DelayBasedTimeSource>( |
85 task_runner_provider_->ImplThreadTaskRunner()))); | 86 task_runner_provider_->ImplThreadTaskRunner()))); |
86 frame_source = unthrottled_begin_frame_source_.get(); | 87 frame_source = unthrottled_begin_frame_source_.get(); |
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
666 bool ProxyImpl::IsMainThreadBlocked() const { | 667 bool ProxyImpl::IsMainThreadBlocked() const { |
667 return task_runner_provider_->IsMainThreadBlocked(); | 668 return task_runner_provider_->IsMainThreadBlocked(); |
668 } | 669 } |
669 | 670 |
670 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { | 671 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { |
671 DCHECK(IsMainThreadBlocked() && commit_completion_event_); | 672 DCHECK(IsMainThreadBlocked() && commit_completion_event_); |
672 return main_thread_blocked_commit_vars_unsafe_; | 673 return main_thread_blocked_commit_vars_unsafe_; |
673 } | 674 } |
674 | 675 |
675 } // namespace cc | 676 } // namespace cc |
OLD | NEW |