Unified BeginFrame scheduling

content/renderer/gpu/compositor_output_surface.h

Index: content/renderer/gpu/compositor_output_surface.h
diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h
index 0b369b27f3eae29d9e91d17962192624d13f62f3..c7db379d85eb6ff055e7928f252f23e179dac34d 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -58,7 +58,7 @@ class CompositorOutputSurface
   // cc::OutputSurface implementation.
   virtual bool BindToClient(cc::OutputSurfaceClient* client) OVERRIDE;
   virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE;
-#if defined(OS_ANDROID)
+#if !defined(OS_MACOSX)
   virtual void SetNeedsBeginFrame(bool enable) OVERRIDE;
 #endif
 
@@ -100,7 +100,7 @@ class CompositorOutputSurface
   void OnMessageReceived(const IPC::Message& message);
   void OnUpdateVSyncParametersFromBrowser(base::TimeTicks timebase,
                                           base::TimeDelta interval);
-#if defined(OS_ANDROID)
+#if !defined(OS_MACOSX)
   void OnBeginFrame(const cc::BeginFrameArgs& args);
 #endif
   bool Send(IPC::Message* message);