Revert "Use MojoCompositorFrameSink in RendererCompositorFrameSink"

content/browser/frame_host/render_widget_host_view_child_frame.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 "content/browser/frame_host/render_widget_host_view_child_frame.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
@@ skipping 331 matching lines @@
   if (!frame_connector_)
     return;
   if ((event.GetType() == blink::WebInputEvent::kGestureScrollUpdate &&
        not_consumed) ||
       event.GetType() == blink::WebInputEvent::kGestureScrollEnd)
     frame_connector_->BubbleScrollEvent(event);
 }
 
 void RenderWidgetHostViewChildFrame::DidReceiveCompositorFrameAck(
     const cc::ReturnedResourceArray& resources) {
-  renderer_compositor_frame_sink_->DidReceiveCompositorFrameAck(resources);
+  if (!host_)
+    return;
+  host_->SendReclaimCompositorResources(true /* is_swap_ack */, resources);
 }
 
-void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink(
-    cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink) {
+void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink() {
   ResetCompositorFrameSinkSupport();
-  renderer_compositor_frame_sink_ = renderer_compositor_frame_sink;
   CreateCompositorFrameSinkSupport();
   has_frame_ = false;
 }
 
 void RenderWidgetHostViewChildFrame::ProcessCompositorFrame(
     const cc::LocalSurfaceId& local_surface_id,
     cc::CompositorFrame frame) {
   current_surface_size_ = frame.render_pass_list.back()->output_rect.size();
   current_surface_scale_factor_ = frame.metadata.device_scale_factor;
 
@@ skipping 252 matching lines @@
   support_->RequestCopyOfSurface(std::move(request));
 }
 
 bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface(
       const gfx::Size& desired_size) {
   return false;
 }
 
 void RenderWidgetHostViewChildFrame::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
-  renderer_compositor_frame_sink_->ReclaimResources(resources);
+  if (!host_)
+    return;
+  host_->SendReclaimCompositorResources(false /* is_swap_ack */, resources);
 }
 
 void RenderWidgetHostViewChildFrame::OnBeginFrame(
     const cc::BeginFrameArgs& args) {
   host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args));
 }
 
 void RenderWidgetHostViewChildFrame::SetNeedsBeginFrames(
     bool needs_begin_frames) {
   if (support_)
@@ skipping 71 matching lines @@
                                                       frame_sink_id_);
   }
   support_.reset();
 }
 
 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() {
   return false;
 }
 
 }  // namespace content