cc: Chromify FrameRateController

cc: Chromify FrameRateController

Style-only change.

BUG=144577
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=189181

[enne (OOO), 2013-03-19 04:14:57]

(Did you want this reviewed? There's no reviewers listed or mail sent.  You get
a review anyway.)

Thanks for the style CL!

lgtm in general, but here's a pile of style nits:

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
File cc/scheduler/frame_rate_controller.cc (right):

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
cc/scheduler/frame_rate_controller.cc:35: : client_(0),
NULL

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
cc/scheduler/frame_rate_controller.cc:42: thread_(0),
NULL

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
cc/scheduler/frame_rate_controller.cc:50: : client_(0),
NULL

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
cc/scheduler/frame_rate_controller.cc:70: if (is_time_source_throttling_)
This if needs curly braces because the else has them.

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
cc/scheduler/frame_rate_controller.cc:112: if (active_)
Needs curly braces because it's a multi-line if statement.

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
File cc/scheduler/frame_rate_controller.h (right):

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
cc/scheduler/frame_rate_controller.h:22: virtual void VsyncTick(bool throttled)
= 0;
cc generally says VSync and not Vsync.

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
cc/scheduler/frame_rate_controller.h:33: kDefaultMaxFramesPending = 2
DEFAULT_MAX_FRAMES_PENDING

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
cc/scheduler/frame_rate_controller.h:47: // Multiple frames can be in-progress,
but for every didBeginFrame, a
DidBeginFrame

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
cc/scheduler/frame_rate_controller.h:48: // didFinishFrame should be posted.
DidFinishFrame

https://codereview.chromium.org/12922002/diff/1/cc/scheduler/frame_rate_contr...
cc/scheduler/frame_rate_controller.h:50: // If the rendering pipeline crashes,
call didAbortAllPendingFrames.
DidAbortAllPendingFrames

[enne (OOO), 2013-03-19 17:58:19]

lgtm

lgtm still, thanks!

(If you get an lgtm, feel free to just correct the mistakes and then land it
without asking for another.)

[commit-bot: I haz the power, 2013-03-19 18:06:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/brianderson@chromium.org/12922002/19001

[commit-bot: I haz the power, 2013-03-19 18:06:31]

Failed to apply patch for cc/scheduler/scheduler.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/scheduler/scheduler.cc
  Hunk #2 FAILED at 89.
  1 out of 5 hunks FAILED -- saving rejects to file
cc/scheduler/scheduler.cc.rej

Patch:       cc/scheduler/scheduler.cc
Index: cc/scheduler/scheduler.cc
diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc
index
6a6f1f22952de41db31e7b621c400f849eab93bb..13994769a01d3f478ddd7f80233e7063776287b6
100644
--- a/cc/scheduler/scheduler.cc
+++ b/cc/scheduler/scheduler.cc
@@ -19,11 +19,11 @@ Scheduler::Scheduler(SchedulerClient* client,
       state_machine_(scheduler_settings),
       inside_process_scheduled_actions_(false) {
   DCHECK(client_);
-  frame_rate_controller_->setClient(this);
+  frame_rate_controller_->SetClient(this);
   DCHECK(!state_machine_.VSyncCallbackNeeded());
 }
 
-Scheduler::~Scheduler() { frame_rate_controller_->setActive(false); }
+Scheduler::~Scheduler() { frame_rate_controller_->SetActive(false); }
 
 void Scheduler::SetCanBeginFrame(bool can) {
   state_machine_.SetCanBeginFrame(can);
@@ -89,25 +89,25 @@ void Scheduler::BeginFrameAborted() {
 }
 
 void Scheduler::SetMaxFramesPending(int max_frames_pending) {
-  frame_rate_controller_->setMaxFramesPending(max_frames_pending);
+  frame_rate_controller_->SetMaxFramesPending(max_frames_pending);
 }
 
 int Scheduler::MaxFramesPending() const {
-  return frame_rate_controller_->maxFramesPending();
+  return frame_rate_controller_->MaxFramesPending();
 }
 
 void Scheduler::SetSwapBuffersCompleteSupported(bool supported) {
-  frame_rate_controller_->setSwapBuffersCompleteSupported(supported);
+  frame_rate_controller_->SetSwapBuffersCompleteSupported(supported);
 }
 
 void Scheduler::DidSwapBuffersComplete() {
   TRACE_EVENT0("cc", "Scheduler::didSwapBuffersComplete");
-  frame_rate_controller_->didFinishFrame();
+  frame_rate_controller_->DidFinishFrame();
 }
 
 void Scheduler::DidLoseOutputSurface() {
   TRACE_EVENT0("cc", "Scheduler::didLoseOutputSurface");
-  frame_rate_controller_->didAbortAllPendingFrames();
+  frame_rate_controller_->DidAbortAllPendingFrames();
   state_machine_.DidLoseOutputSurface();
   ProcessScheduledActions();
 }
@@ -120,19 +120,19 @@ void Scheduler::DidRecreateOutputSurface() {
 
 void Scheduler::SetTimebaseAndInterval(base::TimeTicks timebase,
                                        base::TimeDelta interval) {
-  frame_rate_controller_->setTimebaseAndInterval(timebase, interval);
+  frame_rate_controller_->SetTimebaseAndInterval(timebase, interval);
 }
 
 base::TimeTicks Scheduler::AnticipatedDrawTime() {
-  return frame_rate_controller_->nextTickTime();
+  return frame_rate_controller_->NextTickTime();
 }
 
 base::TimeTicks Scheduler::LastVSyncTime() {
-  return frame_rate_controller_->lastTickTime();
+  return frame_rate_controller_->LastTickTime();
 }
 
-void Scheduler::vsyncTick(bool throttled) {
-  TRACE_EVENT1("cc", "Scheduler::vsyncTick", "throttled", throttled);
+void Scheduler::VSyncTick(bool throttled) {
+  TRACE_EVENT1("cc", "Scheduler::VSyncTick", "throttled", throttled);
   if (!throttled)
     state_machine_.DidEnterVSync();
   ProcessScheduledActions();
@@ -174,14 +174,14 @@ void Scheduler::ProcessScheduledActions() {
             client_->ScheduledActionDrawAndSwapIfPossible();
         state_machine_.DidDrawIfPossibleCompleted(result.did_draw);
         if (result.did_swap)
-          frame_rate_controller_->didBeginFrame();
+          frame_rate_controller_->DidBeginFrame();
         break;
       }
       case SchedulerStateMachine::ACTION_DRAW_FORCED: {
         ScheduledActionDrawAndSwapResult result =
             client_->ScheduledActionDrawAndSwapForced();
         if (result.did_swap)
-          frame_rate_controller_->didBeginFrame();
+          frame_rate_controller_->DidBeginFrame();
         break;
       }
       case SchedulerStateMachine::ACTION_BEGIN_OUTPUT_SURFACE_RECREATION:
@@ -195,8 +195,8 @@ void Scheduler::ProcessScheduledActions() {
   }
 
   // Activate or deactivate the frame rate controller.
-  frame_rate_controller_->setActive(state_machine_.VSyncCallbackNeeded());
- 
client_->DidAnticipatedDrawTimeChange(frame_rate_controller_->nextTickTime());
+  frame_rate_controller_->SetActive(state_machine_.VSyncCallbackNeeded());
+ 
client_->DidAnticipatedDrawTimeChange(frame_rate_controller_->NextTickTime());
 }
 
 }  // namespace cc

[commit-bot: I haz the power, 2013-03-19 20:33:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/brianderson@chromium.org/12922002/35001

[commit-bot: I haz the power, 2013-03-20 00:47:15]

Change committed as 189181