cc: Dedup IPCs to return resources to client

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 <utility>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "cc/output/compositor_frame.h"
-#include "cc/output/compositor_frame_ack.h"
 #include "cc/output/managed_memory_policy.h"
 #include "cc/output/output_surface_client.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/gpu/frame_swap_message_queue.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
@@ skipping 105 matching lines @@
   return 0;
 }
 
 void CompositorOutputSurface::OnMessageReceived(const IPC::Message& message) {
   DCHECK(client_thread_checker_.CalledOnValidThread());
   if (!HasClient())
     return;
   IPC_BEGIN_MESSAGE_MAP(CompositorOutputSurface, message)
     IPC_MESSAGE_HANDLER(ViewMsg_UpdateVSyncParameters,
                         OnUpdateVSyncParametersFromBrowser);
-    IPC_MESSAGE_HANDLER(ViewMsg_SwapCompositorFrameAck, OnSwapAck);
-    IPC_MESSAGE_HANDLER(ViewMsg_ReclaimCompositorResources, OnReclaimResources);
+    IPC_MESSAGE_HANDLER(ViewMsg_ReclaimCompositorResources,
+                        OnReclaimCompositorResources);
   IPC_END_MESSAGE_MAP()
 }
 
 void CompositorOutputSurface::OnUpdateVSyncParametersFromBrowser(
     base::TimeTicks timebase,
     base::TimeDelta interval) {
   DCHECK(client_thread_checker_.CalledOnValidThread());
   TRACE_EVENT2("cc",
                "CompositorOutputSurface::OnUpdateVSyncParametersFromBrowser",
                "timebase", (timebase - base::TimeTicks()).InSecondsF(),
                "interval", interval.InSecondsF());
   client_->CommitVSyncParameters(timebase, interval);
 }
 
-void CompositorOutputSurface::OnSwapAck(uint32_t output_surface_id,
-                                        const cc::CompositorFrameAck& ack) {
+void CompositorOutputSurface::OnReclaimCompositorResources(
+    uint32_t output_surface_id,
+    bool is_swap_ack,
+    const cc::ReturnedResourceArray& resources) {
   // Ignore message if it's a stale one coming from a different output surface
   // (e.g. after a lost context).
   if (output_surface_id != output_surface_id_)
     return;
-  ReclaimResources(&ack);
-  client_->DidSwapBuffersComplete();
-}
-
-void CompositorOutputSurface::OnReclaimResources(
-    uint32_t output_surface_id,
-    const cc::CompositorFrameAck& ack) {
-  // Ignore message if it's a stale one coming from a different output surface
-  // (e.g. after a lost context).
-  if (output_surface_id != output_surface_id_)
-    return;
-  ReclaimResources(&ack);
+  ReclaimResources(resources);
+  if (is_swap_ack)
+    client_->DidSwapBuffersComplete();
 }
 
 bool CompositorOutputSurface::Send(IPC::Message* message) {
   return message_sender_->Send(message);
 }
 
 }  // namespace content