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 bc8984834f6d8b46cf54fc6004611ab910f8d859..3c83fbdcf95f48fc27d0b04d5fa467b2578dc0b2 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -40,7 +40,7 @@ IPC::ForwardingMessageFilter* CompositorOutputSurface::CreateFilter(
     ViewMsg_UpdateVSyncParameters::ID,
     ViewMsg_SwapCompositorFrameAck::ID,
     ViewMsg_ReclaimCompositorResources::ID,
-#if defined(OS_ANDROID)
+#if !defined(OS_MACOSX)
     ViewMsg_BeginFrame::ID
 #endif
   };
@@ -207,7 +207,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)
+#if !defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(ViewMsg_BeginFrame, OnBeginFrame);
 #endif
   IPC_END_MESSAGE_MAP()
@@ -220,7 +220,7 @@ void CompositorOutputSurface::OnUpdateVSyncParametersFromBrowser(
   CommitVSyncParameters(timebase, interval);
 }
 
-#if defined(OS_ANDROID)
+#if !defined(OS_MACOSX)
 void CompositorOutputSurface::SetNeedsBeginFrame(bool enable) {
   DCHECK(CalledOnValidThread());
   Send(new ViewHostMsg_SetNeedsBeginFrame(routing_id_, enable));
@@ -230,7 +230,7 @@ void CompositorOutputSurface::OnBeginFrame(const cc::BeginFrameArgs& args) {
   DCHECK(CalledOnValidThread());
   client_->BeginFrame(args);
 }
-#endif  // defined(OS_ANDROID)
+#endif
 
 void CompositorOutputSurface::OnSwapAck(uint32 output_surface_id,
                                         const cc::CompositorFrameAck& ack) {