Hide compositor_frame_sink_id from RenderWidgetHostView*

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 83 matching lines @@
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/android/view_configuration.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/touch_selection/touch_selection_controller.h"
 
 namespace content {
 
 namespace {
 
-const int kUndefinedCompositorFrameSinkId = -1;
-
 static const char kAsyncReadBackString[] = "Compositing.CopyFromSurfaceTime";
 
 class PendingReadbackLock;
 
 PendingReadbackLock* g_pending_readback_lock = nullptr;
 
 class PendingReadbackLock : public base::RefCounted<PendingReadbackLock> {
  public:
   PendingReadbackLock() {
     DCHECK_EQ(g_pending_readback_lock, nullptr);
@@ skipping 330 matching lines @@
       begin_frame_source_(nullptr),
       outstanding_begin_frame_requests_(0),
       is_showing_(!widget_host->is_hidden()),
       is_window_visible_(true),
       is_window_activity_started_(true),
       is_in_vr_(false),
       content_view_core_(nullptr),
       ime_adapter_android_(nullptr),
       cached_background_color_(SK_ColorWHITE),
       view_(this),
-      last_compositor_frame_sink_id_(kUndefinedCompositorFrameSinkId),
       gesture_provider_(ui::GetGestureProviderConfig(
                             ui::GestureProviderConfigType::CURRENT_PLATFORM),
                         this),
       stylus_text_selector_(this),
       using_browser_compositor_(CompositorImpl::IsInitialized()),
       synchronous_compositor_client_(nullptr),
       frame_evictor_(new DelegatedFrameEvictor(this)),
       observing_root_window_(false),
       prev_top_shown_pix_(0.f),
       prev_bottom_shown_pix_(0.f),
@@ skipping 628 matching lines @@
 }
 
 std::unique_ptr<SyntheticGestureTarget>
 RenderWidgetHostViewAndroid::CreateSyntheticGestureTarget() {
   return std::unique_ptr<SyntheticGestureTarget>(
       new SyntheticGestureTargetAndroid(
           host_, content_view_core_->CreateMotionEventSynthesizer()));
 }
 
 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_));
+  host_->SendReclaimCompositorResources(is_swap_ack,
+                                        surface_returned_resources_);
   surface_returned_resources_.clear();
 }
 
 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 */);
+    SendReclaimCompositorResources(false /* is_swap_ack */);
 }
 
-void RenderWidgetHostViewAndroid::CheckCompositorFrameSinkChanged(
-    uint32_t compositor_frame_sink_id) {
-  if (compositor_frame_sink_id == last_compositor_frame_sink_id_)
-    return;
-
+void RenderWidgetHostViewAndroid::DidCreateNewRendererCompositorFrameSink() {
+  surface_returned_resources_.clear();

[piman, 2017/03/28 23:07:46]

Is it ok not to return the resources? Why?

[Saman Sami, 2017/03/28 23:36:30]

Because the resources we currently have belong to the old
RendererCompositorFrameSink and should not be sent back. See
RendererCompositorFrameSink::OnReclaimCompositorResources, it discards resources
belonging to old frame sinks.

I'm actually gonna move this line to the end of this function. I'm worried that
the line below might populate surfaces_returned_resources_.

[piman, 2017/03/29 17:41:49]

Maybe worth a comment.

   delegated_frame_host_->CompositorFrameSinkChanged();
-
-  if (!surface_returned_resources_.empty())
-    SendReclaimCompositorResources(last_compositor_frame_sink_id_,
-                                   false /* is_swap_ack */);
-
-  last_compositor_frame_sink_id_ = compositor_frame_sink_id;
 }
 
-void RenderWidgetHostViewAndroid::InternalSwapCompositorFrame(
-    uint32_t compositor_frame_sink_id,
+void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
     const cc::LocalSurfaceId& local_surface_id,
     cc::CompositorFrame frame) {
   last_scroll_offset_ = frame.metadata.root_scroll_offset;
   DCHECK(delegated_frame_host_);
   DCHECK(!frame.render_pass_list.empty());
 
   cc::RenderPass* root_pass = frame.render_pass_list.back().get();
   current_surface_size_ = root_pass->output_rect.size();
   bool is_transparent = root_pass->has_transparent_background;
 
   cc::CompositorFrameMetadata metadata = frame.metadata.Clone();
 
-  CheckCompositorFrameSinkChanged(compositor_frame_sink_id);
   bool has_content = !current_surface_size_.IsEmpty();
 
   base::Closure ack_callback =
       base::Bind(&RenderWidgetHostViewAndroid::SendReclaimCompositorResources,
-                 weak_ptr_factory_.GetWeakPtr(), compositor_frame_sink_id,
-                 true /* is_swap_ack */);
+                 weak_ptr_factory_.GetWeakPtr(), true /* is_swap_ack */);
 
   ack_callbacks_.push(ack_callback);
 
   if (!has_content) {
     DestroyDelegatedContent();
   } else {
     delegated_frame_host_->SubmitCompositorFrame(local_surface_id,
                                                  std::move(frame));
     frame_evictor_->SwappedFrame(!host_->is_hidden());
   }
@@ skipping 14 matching lines @@
   if (!delegated_frame_host_)
     return;
 
   if (!delegated_frame_host_->HasDelegatedContent())
     return;
 
   frame_evictor_->DiscardedFrame();
   delegated_frame_host_->DestroyDelegatedContent();
 }
 
-void RenderWidgetHostViewAndroid::OnSwapCompositorFrame(
-    uint32_t compositor_frame_sink_id,
-    const cc::LocalSurfaceId& local_surface_id,
-    cc::CompositorFrame frame) {
-  InternalSwapCompositorFrame(compositor_frame_sink_id, local_surface_id,
-                              std::move(frame));
-}
-
 void RenderWidgetHostViewAndroid::ClearCompositorFrame() {
   DestroyDelegatedContent();
 }
 
 void RenderWidgetHostViewAndroid::SynchronousFrameMetadata(
     cc::CompositorFrameMetadata frame_metadata) {
   if (!content_view_core_)
     return;
 
   bool is_mobile_optimized = IsMobileOptimizedFrame(frame_metadata);
@@ skipping 924 matching lines @@
 
   ui::WindowAndroidCompositor* compositor = window_android->GetCompositor();
   if (!compositor)
     return;
 
   overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>(
       overscroll_refresh_handler, compositor, view_.GetDipScale());
 }
 
 }  // namespace content