| Index: cc/scheduler/scheduler.cc
|
| diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc
|
| index abbc7aa896459e0c1767c4344ea240499e3d663f..fe2a70cc897196db70c05a2c1aaefeb2eb0d200d 100644
|
| --- a/cc/scheduler/scheduler.cc
|
| +++ b/cc/scheduler/scheduler.cc
|
| @@ -20,7 +20,7 @@ Scheduler::Scheduler(SchedulerClient* client,
|
| inside_process_scheduled_actions_(false) {
|
| DCHECK(client_);
|
| frame_rate_controller_->SetClient(this);
|
| - DCHECK(!state_machine_.VSyncCallbackNeeded());
|
| + DCHECK(!state_machine_.BeginFrameCallbackNeeded());
|
| }
|
|
|
| Scheduler::~Scheduler() { frame_rate_controller_->SetActive(false); }
|
| @@ -131,17 +131,17 @@ base::TimeTicks Scheduler::AnticipatedDrawTime() {
|
| return frame_rate_controller_->NextTickTime();
|
| }
|
|
|
| -base::TimeTicks Scheduler::LastVSyncTime() {
|
| +base::TimeTicks Scheduler::LastBeginFrameTime() {
|
| return frame_rate_controller_->LastTickTime();
|
| }
|
|
|
| -void Scheduler::VSyncTick(bool throttled) {
|
| - TRACE_EVENT1("cc", "Scheduler::VSyncTick", "throttled", throttled);
|
| +void Scheduler::BeginFrame(bool throttled) {
|
| + TRACE_EVENT1("cc", "Scheduler::BeginFrame", "throttled", throttled);
|
| if (!throttled)
|
| - state_machine_.DidEnterVSync();
|
| + state_machine_.DidEnterBeginFrame();
|
| ProcessScheduledActions();
|
| if (!throttled)
|
| - state_machine_.DidLeaveVSync();
|
| + state_machine_.DidLeaveBeginFrame();
|
| }
|
|
|
| void Scheduler::ProcessScheduledActions() {
|
| @@ -199,7 +199,7 @@ void Scheduler::ProcessScheduledActions() {
|
| }
|
|
|
| // Activate or deactivate the frame rate controller.
|
| - frame_rate_controller_->SetActive(state_machine_.VSyncCallbackNeeded());
|
| + frame_rate_controller_->SetActive(state_machine_.BeginFrameCallbackNeeded());
|
| client_->DidAnticipatedDrawTimeChange(frame_rate_controller_->NextTickTime());
|
| }
|
|
|
|
|