cc: Dedup IPCs to return resources to client

android_webview/browser/browser_view_renderer.cc

 // Copyright 2014 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 "android_webview/browser/browser_view_renderer.h"
 
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer_client.h"
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/compositor_frame_consumer.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/supports_user_data.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/output/compositor_frame.h"
-#include "cc/output/compositor_frame_ack.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/geometry/point.h"
@@ skipping 257 matching lines @@
   ReturnUnusedResource(compositor_frame_consumer->PassUncommittedFrameOnUI());
   ReturnResourceFromParent(compositor_frame_consumer);
   compositor_frame_consumer->SetCompositorFrameProducer(nullptr);
 }
 
 void BrowserViewRenderer::ReturnUnusedResource(
     std::unique_ptr<ChildFrame> child_frame) {
   if (!child_frame.get() || !child_frame->frame.get())
     return;
 
-  cc::CompositorFrameAck frame_ack;
+  cc::ReturnedResourceArray resources;
   cc::TransferableResource::ReturnResources(
-      child_frame->frame->delegated_frame_data->resource_list,
-      &frame_ack.resources);
+      child_frame->frame->delegated_frame_data->resource_list, &resources);
   content::SynchronousCompositor* compositor =
       FindCompositor(child_frame->compositor_id);
-  if (compositor && !frame_ack.resources.empty())
-    compositor->ReturnResources(child_frame->output_surface_id, frame_ack);
+  if (compositor && !resources.empty())
+    compositor->ReturnResources(child_frame->output_surface_id, resources);
 }
 
 void BrowserViewRenderer::ReturnResourceFromParent(
     CompositorFrameConsumer* compositor_frame_consumer) {
   CompositorFrameConsumer::ReturnedResourcesMap returned_resource_map;
   compositor_frame_consumer->SwapReturnedResourcesOnUI(&returned_resource_map);
   for (auto& pair : returned_resource_map) {
     CompositorID compositor_id = pair.first;
     content::SynchronousCompositor* compositor = FindCompositor(compositor_id);
-    cc::CompositorFrameAck frame_ack;
-    frame_ack.resources.swap(pair.second.resources);
+    cc::ReturnedResourceArray resources;
+    resources.swap(pair.second.resources);
 
-    if (compositor && !frame_ack.resources.empty()) {
-      compositor->ReturnResources(pair.second.output_surface_id, frame_ack);
+    if (compositor && !resources.empty()) {
+      compositor->ReturnResources(pair.second.output_surface_id, resources);
     }
   }
 }
 
 bool BrowserViewRenderer::OnDrawSoftware(SkCanvas* canvas) {
   return CanOnDraw() && CompositeSW(canvas);
 }
 
 sk_sp<SkPicture> BrowserViewRenderer::CapturePicture(int width,
                                                      int height) {
@@ skipping 411 matching lines @@
   base::StringAppendF(&str,
                       "overscroll_rounding_error_: %s ",
                       overscroll_rounding_error_.ToString().c_str());
   base::StringAppendF(
       &str, "on_new_picture_enable: %d ", on_new_picture_enable_);
   base::StringAppendF(&str, "clear_view: %d ", clear_view_);
   return str;
 }
 
 }  // namespace android_webview