| 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 TRACE_EVENT0("cc", "ProxyImpl::ProxyImpl"); | 67 TRACE_EVENT0("cc", "ProxyImpl::ProxyImpl"); |
| 68 DCHECK(IsImplThread()); | 68 DCHECK(IsImplThread()); |
| 69 DCHECK(IsMainThreadBlocked()); | 69 DCHECK(IsMainThreadBlocked()); |
| 70 | 70 |
| 71 layer_tree_host_impl_ = layer_tree_host->CreateLayerTreeHostImpl(this); | 71 layer_tree_host_impl_ = layer_tree_host->CreateLayerTreeHostImpl(this); |
| 72 | 72 |
| 73 SchedulerSettings scheduler_settings( | 73 SchedulerSettings scheduler_settings( |
| 74 layer_tree_host->settings().ToSchedulerSettings()); | 74 layer_tree_host->settings().ToSchedulerSettings()); |
| 75 | 75 |
| 76 scoped_ptr<CompositorTimingHistory> compositor_timing_history( | 76 scoped_ptr<CompositorTimingHistory> compositor_timing_history( |
| 77 new CompositorTimingHistory(CompositorTimingHistory::RENDERER_UMA, | 77 new CompositorTimingHistory( |
| 78 rendering_stats_instrumentation_)); | 78 scheduler_settings.using_synchronous_renderer_compositor, |
| 79 CompositorTimingHistory::RENDERER_UMA, |
| 80 rendering_stats_instrumentation_)); |
| 79 | 81 |
| 80 scheduler_ = Scheduler::Create(this, scheduler_settings, layer_tree_host_id_, | 82 scheduler_ = Scheduler::Create(this, scheduler_settings, layer_tree_host_id_, |
| 81 task_runner_provider_->ImplThreadTaskRunner(), | 83 task_runner_provider_->ImplThreadTaskRunner(), |
| 82 external_begin_frame_source_.get(), | 84 external_begin_frame_source_.get(), |
| 83 std::move(compositor_timing_history)); | 85 std::move(compositor_timing_history)); |
| 84 | 86 |
| 85 DCHECK_EQ(scheduler_->visible(), layer_tree_host_impl_->visible()); | 87 DCHECK_EQ(scheduler_->visible(), layer_tree_host_impl_->visible()); |
| 86 } | 88 } |
| 87 | 89 |
| 88 ProxyImpl::BlockedMainCommitOnly::BlockedMainCommitOnly() | 90 ProxyImpl::BlockedMainCommitOnly::BlockedMainCommitOnly() |
| (...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 671 bool ProxyImpl::IsMainThreadBlocked() const { | 673 bool ProxyImpl::IsMainThreadBlocked() const { |
| 672 return task_runner_provider_->IsMainThreadBlocked(); | 674 return task_runner_provider_->IsMainThreadBlocked(); |
| 673 } | 675 } |
| 674 | 676 |
| 675 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { | 677 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { |
| 676 DCHECK(IsMainThreadBlocked() && commit_completion_event_); | 678 DCHECK(IsMainThreadBlocked() && commit_completion_event_); |
| 677 return main_thread_blocked_commit_vars_unsafe_; | 679 return main_thread_blocked_commit_vars_unsafe_; |
| 678 } | 680 } |
| 679 | 681 |
| 680 } // namespace cc | 682 } // namespace cc |
| OLD | NEW |