Aura: Browser-side changes for Composite-To-Mailbox

content/renderer/gpu/compositor_output_surface.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/gpu/compositor_output_surface.h"
 
 #include "base/message_loop_proxy.h"
 #include "cc/compositor_frame.h"
+#include "cc/compositor_frame_ack.h"
 #include "cc/output_surface_client.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/render_thread_impl.h"
 #include "ipc/ipc_forwarding_message_filter.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 
 using cc::CompositorFrame;
 using cc::SoftwareOutputDevice;
 using WebKit::WebGraphicsContext3D;
 
 namespace content {
 
 //------------------------------------------------------------------------------
 
 // static
 IPC::ForwardingMessageFilter* CompositorOutputSurface::CreateFilter(
     base::TaskRunner* target_task_runner)
 {
-  uint32 messages_to_filter[] = {ViewMsg_UpdateVSyncParameters::ID};
+  uint32 messages_to_filter[] = {
+    ViewMsg_UpdateVSyncParameters::ID,
+    ViewMsg_SwapCompositorFrameAck::ID
+  };
+
   return new IPC::ForwardingMessageFilter(
       messages_to_filter, arraysize(messages_to_filter),
       target_task_runner);
 }
 
 CompositorOutputSurface::CompositorOutputSurface(
     int32 routing_id,
     WebGraphicsContext3D* context3D,
-    cc::SoftwareOutputDevice* software_device)
+    cc::SoftwareOutputDevice* software_device,
+    bool renderToMailbox)
     : output_surface_filter_(
           RenderThreadImpl::current()->compositor_output_surface_filter()),
       client_(NULL),
       routing_id_(routing_id),
       context3D_(context3D),
       software_device_(software_device) {
   DCHECK(output_surface_filter_);
   capabilities_.has_parent_compositor = false;
+  capabilities_.render_to_mailbox = renderToMailbox;
   DetachFromThread();
 }
 
 CompositorOutputSurface::~CompositorOutputSurface() {
   DCHECK(CalledOnValidThread());
   if (!client_)
     return;
   output_surface_proxy_->ClearOutputSurface();
   output_surface_filter_->RemoveRoute(routing_id_);
 }
@@ skipping 38 matching lines @@
   DCHECK(CalledOnValidThread());
   Send(new ViewHostMsg_SwapCompositorFrame(routing_id_, *frame));
 }
 
 void CompositorOutputSurface::OnMessageReceived(const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
   if (!client_)
     return;
   IPC_BEGIN_MESSAGE_MAP(CompositorOutputSurface, message)
     IPC_MESSAGE_HANDLER(ViewMsg_UpdateVSyncParameters, OnUpdateVSyncParameters);
+    IPC_MESSAGE_HANDLER(ViewMsg_SwapCompositorFrameAck, OnSwapAck);
   IPC_END_MESSAGE_MAP()
 }
 
 void CompositorOutputSurface::OnUpdateVSyncParameters(
     base::TimeTicks timebase, base::TimeDelta interval) {
   DCHECK(CalledOnValidThread());
   DCHECK(client_);
   client_->OnVSyncParametersChanged(timebase, interval);
 }
 
+void CompositorOutputSurface::OnSwapAck(const cc::CompositorFrameAck& ack) {
+  client_->OnSendFrameToParentCompositorAck(ack);
+}
+
 bool CompositorOutputSurface::Send(IPC::Message* message) {
   return ChildThread::current()->sync_message_filter()->Send(message);
 }
 
 }  // namespace content