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/profiler/scoped_tracker.h" | 8 #include "base/profiler/scoped_tracker.h" |
9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
10 #include "cc/animation/animation_events.h" | 10 #include "cc/animation/animation_events.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 external_begin_frame_source_ = std::move(external_begin_frame_source); | 60 external_begin_frame_source_ = std::move(external_begin_frame_source); |
61 | 61 |
62 if (layer_tree_host_->settings().single_thread_proxy_scheduler && | 62 if (layer_tree_host_->settings().single_thread_proxy_scheduler && |
63 !scheduler_on_impl_thread_) { | 63 !scheduler_on_impl_thread_) { |
64 SchedulerSettings scheduler_settings( | 64 SchedulerSettings scheduler_settings( |
65 layer_tree_host_->settings().ToSchedulerSettings()); | 65 layer_tree_host_->settings().ToSchedulerSettings()); |
66 scheduler_settings.commit_to_active_tree = CommitToActiveTree(); | 66 scheduler_settings.commit_to_active_tree = CommitToActiveTree(); |
67 | 67 |
68 scoped_ptr<CompositorTimingHistory> compositor_timing_history( | 68 scoped_ptr<CompositorTimingHistory> compositor_timing_history( |
69 new CompositorTimingHistory( | 69 new CompositorTimingHistory( |
| 70 scheduler_settings.using_synchronous_renderer_compositor, |
70 CompositorTimingHistory::BROWSER_UMA, | 71 CompositorTimingHistory::BROWSER_UMA, |
71 layer_tree_host_->rendering_stats_instrumentation())); | 72 layer_tree_host_->rendering_stats_instrumentation())); |
72 | 73 |
73 scheduler_on_impl_thread_ = | 74 scheduler_on_impl_thread_ = |
74 Scheduler::Create(this, scheduler_settings, layer_tree_host_->id(), | 75 Scheduler::Create(this, scheduler_settings, layer_tree_host_->id(), |
75 task_runner_provider_->MainThreadTaskRunner(), | 76 task_runner_provider_->MainThreadTaskRunner(), |
76 external_begin_frame_source_.get(), | 77 external_begin_frame_source_.get(), |
77 std::move(compositor_timing_history)); | 78 std::move(compositor_timing_history)); |
78 } | 79 } |
79 | 80 |
(...skipping 794 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
874 << "DidFinishImplFrame called while not inside an impl frame!"; | 875 << "DidFinishImplFrame called while not inside an impl frame!"; |
875 inside_impl_frame_ = false; | 876 inside_impl_frame_ = false; |
876 #endif | 877 #endif |
877 } | 878 } |
878 | 879 |
879 void SingleThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) { | 880 void SingleThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) { |
880 layer_tree_host_->SendBeginFramesToChildren(args); | 881 layer_tree_host_->SendBeginFramesToChildren(args); |
881 } | 882 } |
882 | 883 |
883 } // namespace cc | 884 } // namespace cc |
OLD | NEW |