cc: Dedup IPCs to return resources to client

content/browser/renderer_host/render_widget_host_view_android.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/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include <utility>
 
@@ skipping 926 matching lines @@
 void RenderWidgetHostViewAndroid::SendDelegatedFrameAck(
     uint32_t output_surface_id) {
   DCHECK(host_);
   cc::CompositorFrameAck ack;
   if (!surface_returned_resources_.empty())
     ack.resources.swap(surface_returned_resources_);
   host_->Send(new ViewMsg_SwapCompositorFrameAck(host_->GetRoutingID(),
                                                  output_surface_id, ack));
 }
 
-void RenderWidgetHostViewAndroid::SendReturnedDelegatedResources(
-    uint32_t output_surface_id) {
-  DCHECK(host_);
-  cc::CompositorFrameAck ack;
-  DCHECK(!surface_returned_resources_.empty());
-  ack.resources.swap(surface_returned_resources_);
-
-  host_->Send(new ViewMsg_ReclaimCompositorResources(host_->GetRoutingID(),
-                                                     output_surface_id, ack));
-}
-
 void RenderWidgetHostViewAndroid::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   if (resources.empty())
     return;
   std::copy(resources.begin(), resources.end(),
             std::back_inserter(surface_returned_resources_));
   if (ack_callbacks_.empty())
-    SendReturnedDelegatedResources(last_output_surface_id_);
+    SendDelegatedFrameAck(last_output_surface_id_);
 }
 
 void RenderWidgetHostViewAndroid::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Hook this up.
 }
 
 void RenderWidgetHostViewAndroid::DestroyDelegatedContent() {
   RemoveLayers();
   if (!surface_id_.is_null()) {
     DCHECK(surface_factory_.get());
     surface_factory_->Destroy(surface_id_);
     surface_id_ = cc::SurfaceId();
   }
   view_.SetLayer(nullptr);
 }
 
 void RenderWidgetHostViewAndroid::CheckOutputSurfaceChanged(
     uint32_t output_surface_id) {
   if (output_surface_id == last_output_surface_id_)
     return;
   DestroyDelegatedContent();
   surface_factory_.reset();
   if (!surface_returned_resources_.empty())
-    SendReturnedDelegatedResources(last_output_surface_id_);
+    SendDelegatedFrameAck(last_output_surface_id_);
 
   last_output_surface_id_ = output_surface_id;
 }
 
 void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
   cc::SurfaceManager* manager = CompositorImpl::GetSurfaceManager();
   if (!surface_factory_) {
     surface_factory_ = base::WrapUnique(new cc::SurfaceFactory(manager, this));
   }
@@ skipping 992 matching lines @@
     case ui::MotionEvent::ACTION_UP:
     case ui::MotionEvent::ACTION_POINTER_UP:
       UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED",
                                   delta.InMicroseconds(), 1, 1000000, 50);
     default:
       return;
   }
 }
 
 }  // namespace content