Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Side by Side Diff: cc/trees/proxy_impl.cc

Issue 1840223002: cc: Remove BeginFrameSource::Create methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test BFS and mus too Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/test/scheduler_test_common.cc ('k') | cc/trees/single_thread_proxy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 scoped_ptr<CompositorTimingHistory> compositor_timing_history( 76 scoped_ptr<CompositorTimingHistory> compositor_timing_history(
77 new CompositorTimingHistory( 77 new CompositorTimingHistory(
78 scheduler_settings.using_synchronous_renderer_compositor, 78 scheduler_settings.using_synchronous_renderer_compositor,
79 CompositorTimingHistory::RENDERER_UMA, 79 CompositorTimingHistory::RENDERER_UMA,
80 rendering_stats_instrumentation_)); 80 rendering_stats_instrumentation_));
81 81
82 BeginFrameSource* frame_source = external_begin_frame_source_.get(); 82 BeginFrameSource* frame_source = external_begin_frame_source_.get();
83 if (!scheduler_settings.throttle_frame_production) { 83 if (!scheduler_settings.throttle_frame_production) {
84 // Unthrottled source takes precedence over external sources. 84 // Unthrottled source takes precedence over external sources.
85 unthrottled_begin_frame_source_ = BackToBackBeginFrameSource::Create( 85 unthrottled_begin_frame_source_.reset(new BackToBackBeginFrameSource(
86 task_runner_provider_->ImplThreadTaskRunner()); 86 task_runner_provider_->ImplThreadTaskRunner()));
87 frame_source = unthrottled_begin_frame_source_.get(); 87 frame_source = unthrottled_begin_frame_source_.get();
88 } 88 }
89 if (!frame_source) { 89 if (!frame_source) {
90 synthetic_begin_frame_source_ = SyntheticBeginFrameSource::Create( 90 synthetic_begin_frame_source_.reset(new SyntheticBeginFrameSource(
91 task_runner_provider_->ImplThreadTaskRunner(), 91 task_runner_provider_->ImplThreadTaskRunner(),
92 BeginFrameArgs::DefaultInterval()); 92 BeginFrameArgs::DefaultInterval()));
93 frame_source = synthetic_begin_frame_source_.get(); 93 frame_source = synthetic_begin_frame_source_.get();
94 } 94 }
95 scheduler_ = 95 scheduler_ =
96 Scheduler::Create(this, scheduler_settings, layer_tree_host_id_, 96 Scheduler::Create(this, scheduler_settings, layer_tree_host_id_,
97 task_runner_provider_->ImplThreadTaskRunner(), 97 task_runner_provider_->ImplThreadTaskRunner(),
98 frame_source, std::move(compositor_timing_history)); 98 frame_source, std::move(compositor_timing_history));
99 99
100 DCHECK_EQ(scheduler_->visible(), layer_tree_host_impl_->visible()); 100 DCHECK_EQ(scheduler_->visible(), layer_tree_host_impl_->visible());
101 } 101 }
102 102
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 bool ProxyImpl::IsMainThreadBlocked() const { 680 bool ProxyImpl::IsMainThreadBlocked() const {
681 return task_runner_provider_->IsMainThreadBlocked(); 681 return task_runner_provider_->IsMainThreadBlocked();
682 } 682 }
683 683
684 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { 684 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() {
685 DCHECK(IsMainThreadBlocked() && commit_completion_event_); 685 DCHECK(IsMainThreadBlocked() && commit_completion_event_);
686 return main_thread_blocked_commit_vars_unsafe_; 686 return main_thread_blocked_commit_vars_unsafe_;
687 } 687 }
688 688
689 } // namespace cc 689 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/scheduler_test_common.cc ('k') | cc/trees/single_thread_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698