Hide compositor_frame_sink_id from RenderWidgetHostView*

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 36 matching lines @@
   return view;
 }
 
 RenderWidgetHostViewChildFrame::RenderWidgetHostViewChildFrame(
     RenderWidgetHost* widget_host)
     : host_(RenderWidgetHostImpl::From(widget_host)),
       frame_sink_id_(
           base::checked_cast<uint32_t>(widget_host->GetProcess()->GetID()),
           base::checked_cast<uint32_t>(widget_host->GetRoutingID())),
       next_surface_sequence_(1u),
-      last_compositor_frame_sink_id_(0),
       current_surface_scale_factor_(1.f),
       frame_connector_(nullptr),
       weak_factory_(this) {
   GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
   CreateCompositorFrameSinkSupport();
 }
 
 RenderWidgetHostViewChildFrame::~RenderWidgetHostViewChildFrame() {
   ResetCompositorFrameSinkSupport();
   if (GetSurfaceManager())
@@ skipping 268 matching lines @@
     return;
   if ((event.type() == blink::WebInputEvent::GestureScrollUpdate &&
        not_consumed) ||
       event.type() == blink::WebInputEvent::GestureScrollEnd)
     frame_connector_->BubbleScrollEvent(event);
 }
 
 void RenderWidgetHostViewChildFrame::DidReceiveCompositorFrameAck() {
   if (!host_)
     return;
-  host_->Send(new ViewMsg_ReclaimCompositorResources(
-      host_->GetRoutingID(), last_compositor_frame_sink_id_,
-      true /* is_swap_ack */, cc::ReturnedResourceArray()));
+  host_->SendReclaimCompositorResources(true /* is_swap_ack */,
+                                        cc::ReturnedResourceArray());
+}
+
+void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink() {
+  ResetCompositorFrameSinkSupport();
+  CreateCompositorFrameSinkSupport();
+  has_frame_ = false;
 }
 
 void RenderWidgetHostViewChildFrame::ProcessCompositorFrame(
-    uint32_t compositor_frame_sink_id,
     const cc::LocalSurfaceId& local_surface_id,
     cc::CompositorFrame frame) {
-  // If the renderer changed its frame sink, reset the
-  // CompositorFrameSinkSupport to avoid returning stale resources.
-  if (compositor_frame_sink_id != last_compositor_frame_sink_id_) {
-    ResetCompositorFrameSinkSupport();
-    CreateCompositorFrameSinkSupport();
-    last_compositor_frame_sink_id_ = compositor_frame_sink_id;
-  }
-
   current_surface_size_ = frame.render_pass_list.back()->output_rect.size();
   current_surface_scale_factor_ = frame.metadata.device_scale_factor;
 
   support_->SubmitCompositorFrame(local_surface_id, std::move(frame));
   has_frame_ = true;
 
   if (local_surface_id_ != local_surface_id || HasEmbedderChanged()) {
     local_surface_id_ = local_surface_id;
     SendSurfaceInfoToEmbedder();
   }
@@ skipping 13 matching lines @@
                                current_surface_size_);
   SendSurfaceInfoToEmbedderImpl(surface_info, sequence);
 }
 
 void RenderWidgetHostViewChildFrame::SendSurfaceInfoToEmbedderImpl(
     const cc::SurfaceInfo& surface_info,
     const cc::SurfaceSequence& sequence) {
   frame_connector_->SetChildFrameSurface(surface_info, sequence);
 }
 
-void RenderWidgetHostViewChildFrame::OnSwapCompositorFrame(
-    uint32_t compositor_frame_sink_id,
+void RenderWidgetHostViewChildFrame::SubmitCompositorFrame(
     const cc::LocalSurfaceId& local_surface_id,
     cc::CompositorFrame frame) {
   TRACE_EVENT0("content",
                "RenderWidgetHostViewChildFrame::OnSwapCompositorFrame");
   last_scroll_offset_ = frame.metadata.root_scroll_offset;
   if (!frame_connector_)
     return;
-  ProcessCompositorFrame(compositor_frame_sink_id, local_surface_id,
-                         std::move(frame));
+  ProcessCompositorFrame(local_surface_id, std::move(frame));
 }
 
 void RenderWidgetHostViewChildFrame::OnBeginFrameDidNotSwap(
     const cc::BeginFrameAck& ack) {
   support_->BeginFrameDidNotSwap(ack);
 }
 
 void RenderWidgetHostViewChildFrame::ProcessFrameSwappedCallbacks() {
   // We only use callbacks once, therefore we make a new list for registration
   // before we start, and discard the old list entries when we are done.
@@ skipping 195 matching lines @@
 
 bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface(
       const gfx::Size& desired_size) {
   return false;
 }
 
 void RenderWidgetHostViewChildFrame::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   if (!host_)
     return;
-  host_->Send(new ViewMsg_ReclaimCompositorResources(
-      host_->GetRoutingID(), last_compositor_frame_sink_id_,
-      false /* is_swap_ack */, resources));
+  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 69 matching lines @@
                                                       frame_sink_id_);
   }
   support_.reset();
 }
 
 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() {
   return false;
 }
 
 }  // namespace content