cc: Make separate interface for BeginFrame ipc from OutputSurface

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 c579d8c402912d65ad030226c553016b0d31a0ad..8ac5ecc214a6a1399a2e7334baa46dab3db68160 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -39,10 +39,7 @@ IPC::ForwardingMessageFilter* CompositorOutputSurface::CreateFilter(
   uint32 messages_to_filter[] = {
     ViewMsg_UpdateVSyncParameters::ID,

[Sami, 2014/10/10 13:32:33]

Do we still need this message in this new world?

[mithro-old, 2014/10/13 02:56:20]

/Eventually/ we can remove this UpdateVSyncParameters, but we need to make
everything use the BeginFrameArgs API first.

[simonhong, 2014/10/15 01:04:22]

Yes, we should maintain this message in a short term
because browser process in cros still uses threaded compositing mode.
However, Browser initiated BeginFrame will only be adopted by single threaded
mode.

     ViewMsg_SwapCompositorFrameAck::ID,
-    ViewMsg_ReclaimCompositorResources::ID,
-#if defined(OS_ANDROID)
-    ViewMsg_BeginFrame::ID
-#endif
+    ViewMsg_ReclaimCompositorResources::ID
   };
 
   return new IPC::ForwardingMessageFilter(
@@ -84,7 +81,6 @@ CompositorOutputSurface::CompositorOutputSurface(
 
 CompositorOutputSurface::~CompositorOutputSurface() {
   DCHECK(CalledOnValidThread());
-  SetNeedsBeginFrame(false);
   if (!HasClient())
     return;
   UpdateSmoothnessTakesPriority(false);
@@ -193,9 +189,6 @@ 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()
 }
 
@@ -206,18 +199,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));
-}
-
-void CompositorOutputSurface::OnBeginFrame(const cc::BeginFrameArgs& args) {
-  DCHECK(CalledOnValidThread());
-  client_->BeginFrame(args);
-}
-#endif  // defined(OS_ANDROID)
-
 void CompositorOutputSurface::OnSwapAck(uint32 output_surface_id,
                                         const cc::CompositorFrameAck& ack) {
   // Ignore message if it's a stale one coming from a different output surface