cc: Handle retroactive BeginFrames in the Scheduler.

content/renderer/gpu/compositor_output_surface.cc

Index: content/renderer/gpu/compositor_output_surface.cc
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc
index 19e593985dc98112848fda85e10d4c6840473427..dd9d632bad46c66dc8511325b244b8bda55b1356 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -80,7 +80,7 @@ CompositorOutputSurface::CompositorOutputSurface(
 
 CompositorOutputSurface::~CompositorOutputSurface() {
   DCHECK(CalledOnValidThread());
-  SetNeedsBeginImplFrame(false);
+  SetNeedsBeginFrame(false);
   if (!HasClient())
     return;
   UpdateSmoothnessTakesPriority(false);
@@ -192,7 +192,7 @@ void CompositorOutputSurface::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ViewMsg_SwapCompositorFrameAck, OnSwapAck);
     IPC_MESSAGE_HANDLER(ViewMsg_ReclaimCompositorResources, OnReclaimResources);
 #if defined(OS_ANDROID)
-    IPC_MESSAGE_HANDLER(ViewMsg_BeginFrame, OnBeginImplFrame);
+    IPC_MESSAGE_HANDLER(ViewMsg_BeginFrame, OnBeginFrame);
 #endif
   IPC_END_MESSAGE_MAP()
 }
@@ -205,16 +205,16 @@ void CompositorOutputSurface::OnUpdateVSyncParametersFromBrowser(
 }
 
 #if defined(OS_ANDROID)
-void CompositorOutputSurface::SetNeedsBeginImplFrame(bool enable) {
+void CompositorOutputSurface::SetNeedsBeginFrame(bool enable) {
   DCHECK(CalledOnValidThread());
-  if (needs_begin_impl_frame_ != enable)
+  if (needs_begin_frame_ != enable)
     Send(new ViewHostMsg_SetNeedsBeginFrame(routing_id_, enable));
-  OutputSurface::SetNeedsBeginImplFrame(enable);
+  OutputSurface::SetNeedsBeginFrame(enable);
 }
 
-void CompositorOutputSurface::OnBeginImplFrame(const cc::BeginFrameArgs& args) {
+void CompositorOutputSurface::OnBeginFrame(const cc::BeginFrameArgs& args) {
   DCHECK(CalledOnValidThread());
-  BeginImplFrame(args);
+  BeginFrame(args);
 }
 #endif  // defined(OS_ANDROID)