Chromium Code Reviews| Index: cc/scheduler/scheduler.cc |
| diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc |
| index 5b15a5a60f990de3f088e76bf89f5d903f41cd6b..35734f3831ba3112ef9f0ef29b48c20899f19e19 100644 |
| --- a/cc/scheduler/scheduler.cc |
| +++ b/cc/scheduler/scheduler.cc |
| @@ -5,6 +5,7 @@ |
| #include "cc/scheduler/scheduler.h" |
| #include <algorithm> |
| + |
| #include "base/auto_reset.h" |
| #include "base/debug/trace_event.h" |
| #include "base/debug/trace_event_argument.h" |
| @@ -32,8 +33,8 @@ BeginFrameSource* SchedulerFrameSourcesConstructor::ConstructPrimaryFrameSource( |
| TRACE_EVENT1("cc", |
| "Scheduler::Scheduler()", |
| "PrimaryFrameSource", |
| - "SchedulerClient"); |
| - return scheduler->client_->ExternalBeginFrameSource(); |
| + "ExternalBeginFrameSource"); |
| + return scheduler->external_begin_frame_source_internal_.get(); |
| } else { |
| TRACE_EVENT1("cc", |
| "Scheduler::Scheduler()", |
| @@ -73,12 +74,14 @@ Scheduler::Scheduler( |
| const SchedulerSettings& scheduler_settings, |
| int layer_tree_host_id, |
| const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
| + scoped_ptr<ExternalBeginFrameSource> external_begin_frame_source, |
| SchedulerFrameSourcesConstructor* frame_sources_constructor) |
| : frame_source_(), |
| primary_frame_source_(NULL), |
| background_frame_source_(NULL), |
| primary_frame_source_internal_(), |
| background_frame_source_internal_(), |
| + external_begin_frame_source_internal_(external_begin_frame_source.Pass()), |
|
mithro-old
2014/10/13 02:56:20
Can we just store this in the primary_frame_source
simonhong
2014/10/15 01:04:21
external_begin_frame_source is changed to ref-coun
|
| vsync_observer_(NULL), |
| settings_(scheduler_settings), |
| client_(client), |
| @@ -96,6 +99,13 @@ Scheduler::Scheduler( |
| DCHECK(client_); |
| DCHECK(!state_machine_.BeginFrameNeeded()); |
| + if (settings_.begin_frame_scheduling_enabled) { |
| + DCHECK(external_begin_frame_source_internal_.get()); |
| + external_begin_frame_source_internal_->SetClientReady(); |
|
mithro-old
2014/10/13 02:56:20
I'm unsure what the "SetClientReady" function is f
simonhong
2014/10/15 01:04:21
SetClientReady() will be used if BeginFrameSource
|
| + } else { |
| + DCHECK(!external_begin_frame_source_internal_.get()); |
| + } |
| + |
| begin_retro_frame_closure_ = |
| base::Bind(&Scheduler::BeginRetroFrame, weak_factory_.GetWeakPtr()); |
| begin_impl_frame_deadline_closure_ = base::Bind( |