Unified BeginFrame scheduling

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 2f7cfc8c5ee9336f69d609c86fea03ecd9456f87..8f29c51b9e1c579960911e784c7a836e045a9163 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -40,9 +40,7 @@ IPC::ForwardingMessageFilter* CompositorOutputSurface::CreateFilter(
     ViewMsg_UpdateVSyncParameters::ID,
     ViewMsg_SwapCompositorFrameAck::ID,
     ViewMsg_ReclaimCompositorResources::ID,
-#if defined(OS_ANDROID)
     ViewMsg_BeginFrame::ID
-#endif
   };
 
   return new IPC::ForwardingMessageFilter(
@@ -207,9 +205,7 @@ void CompositorOutputSurface::OnMessageReceived(const IPC::Message& message) {
                         OnUpdateVSyncParametersFromBrowser);
     IPC_MESSAGE_HANDLER(ViewMsg_SwapCompositorFrameAck, OnSwapAck);
     IPC_MESSAGE_HANDLER(ViewMsg_ReclaimCompositorResources, OnReclaimResources);
-#if defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(ViewMsg_BeginFrame, OnBeginFrame);
-#endif
   IPC_END_MESSAGE_MAP()
 }
 
@@ -220,7 +216,6 @@ void CompositorOutputSurface::OnUpdateVSyncParametersFromBrowser(
   CommitVSyncParameters(timebase, interval);
 }
 
-#if defined(OS_ANDROID)
 void CompositorOutputSurface::SetNeedsBeginFrame(bool enable) {
   DCHECK(CalledOnValidThread());
   Send(new ViewHostMsg_SetNeedsBeginFrame(routing_id_, enable));
@@ -228,9 +223,8 @@ void CompositorOutputSurface::SetNeedsBeginFrame(bool enable) {
 
 void CompositorOutputSurface::OnBeginFrame(const cc::BeginFrameArgs& args) {
   DCHECK(CalledOnValidThread());
-  client_->BeginFrame(args);
+  BeginFrame(args);
 }
-#endif  // defined(OS_ANDROID)
 
 void CompositorOutputSurface::OnSwapAck(uint32 output_surface_id,
                                         const cc::CompositorFrameAck& ack) {