DelegatedFrameHostAndroid should use CompositorFrameSinkSupport

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 983 matching lines @@
 void RenderWidgetHostViewAndroid::SendReclaimCompositorResources(
     uint32_t compositor_frame_sink_id,
     bool is_swap_ack) {
   DCHECK(host_);
   host_->Send(new ViewMsg_ReclaimCompositorResources(
       host_->GetRoutingID(), compositor_frame_sink_id, is_swap_ack,
       surface_returned_resources_));
   surface_returned_resources_.clear();
 }
 
-void RenderWidgetHostViewAndroid::ReturnResources(
+void RenderWidgetHostViewAndroid::DidReceiveCompositorFrameAck() {
+  RunAckCallbacks();
+}
+
+void RenderWidgetHostViewAndroid::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   if (resources.empty())
     return;
   std::copy(resources.begin(), resources.end(),
             std::back_inserter(surface_returned_resources_));
   if (ack_callbacks_.empty())
     SendReclaimCompositorResources(last_compositor_frame_sink_id_,
                                    false /* is_swap_ack */);
 }
 
@@ skipping 30 matching lines @@
   base::Closure ack_callback =
       base::Bind(&RenderWidgetHostViewAndroid::SendReclaimCompositorResources,
                  weak_ptr_factory_.GetWeakPtr(), compositor_frame_sink_id,
                  true /* is_swap_ack */);
 
   ack_callbacks_.push(ack_callback);
 
   if (!has_content) {
     DestroyDelegatedContent();
   } else {
-    cc::SurfaceFactory::DrawCallback ack_callback =
-        base::Bind(&RenderWidgetHostViewAndroid::RunAckCallbacks,
-                   weak_ptr_factory_.GetWeakPtr());
-    delegated_frame_host_->SubmitCompositorFrame(std::move(frame),
-                                                 ack_callback);
+    delegated_frame_host_->SubmitCompositorFrame(std::move(frame));
     frame_evictor_->SwappedFrame(!host_->is_hidden());
   }
 
   if (host_->is_hidden())
     RunAckCallbacks();
 
   // As the metadata update may trigger view invalidation, always call it after
   // any potential compositor scheduling.
   OnFrameMetadataUpdated(std::move(metadata), is_transparent);
 }
@@ skipping 916 matching lines @@
   ui::WindowAndroidCompositor* compositor = window_android->GetCompositor();
   if (!compositor)
     return;
 
   overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>(
       overscroll_refresh_handler, compositor,
       ui::GetScaleFactorForNativeView(GetNativeView()));
 }
 
 }  // namespace content