DelegatedFrameHost should use CompositorFrameSinkSupport

content/browser/renderer_host/render_widget_host_view_aura_unittest.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_aura.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <tuple>
@@ skipping 410 matching lines @@
   const cc::LocalSurfaceId& GetLocalSurfaceId() const {
     return GetDelegatedFrameHost()->LocalSurfaceIdForTesting();
   }
 
   bool HasFrameData() const { return GetLocalSurfaceId().is_valid(); }
 
   bool released_front_lock_active() const {
     return GetDelegatedFrameHost()->ReleasedFrontLockActiveForTesting();
   }
 
-  void ReturnResources(const cc::ReturnedResourceArray& resources) {
-    GetDelegatedFrameHost()->ReturnResources(resources);
+  void ReclaimResources(const cc::ReturnedResourceArray& resources) {
+    GetDelegatedFrameHost()->ReclaimResources(resources);
   }
 
   void ResetCompositor() { GetDelegatedFrameHost()->ResetCompositor(); }
 
   const ui::MotionEventAura& pointer_state_for_test() {
     return event_handler()->pointer_state();
   }
 
   // In this unit test, |window_| is directly added to the root and is
   // toplevel.
@@ skipping 1317 matching lines @@
   gfx::Rect view_rect(view_size);
 
   view_->InitAsChild(nullptr);
   aura::client::ParentWindowWithContext(
       view_->GetNativeView(), parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(view_size);
   view_->Show();
   sink_->ClearMessages();
 
-  // Accumulate some returned resources. This should not trigger an IPC.
+  // Accumulate some returned resources. This should trigger an IPC.
   cc::ReturnedResourceArray resources;
   cc::ReturnedResource resource;
   resource.id = 1;
   resources.push_back(resource);
-  view_->ReturnResources(resources);
+  view_->ReclaimResources(resources);
   EXPECT_EQ(1u, sink_->message_count());
   {
     const IPC::Message* msg = sink_->GetMessageAt(0);
     EXPECT_EQ(ViewMsg_ReclaimCompositorResources::ID, msg->type());
     ViewMsg_ReclaimCompositorResources::Param params;
     ViewMsg_ReclaimCompositorResources::Read(msg, &params);
     EXPECT_EQ(0u, std::get<0>(params));  // compositor_frame_sink_id
     EXPECT_FALSE(std::get<1>(params));   // is_swap_ack
   }
 }
@@ skipping 11 matching lines @@
   gfx::Rect view_rect(view_size);
 
   view_->InitAsChild(nullptr);
   aura::client::ParentWindowWithContext(
       view_->GetNativeView(), parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(view_size);
   view_->Show();
   sink_->ClearMessages();
 
-  view_->OnSwapCompositorFrame(0,
-                               MakeDelegatedFrame(1.f, view_size, view_rect));
-
-  // Accumulate some returned resources. This should not trigger an IPC.
-  cc::ReturnedResourceArray resources;
-  cc::ReturnedResource resource;
+  // Submit a frame with resources.
+  cc::CompositorFrame frame = MakeDelegatedFrame(1.f, view_size, view_rect);
+  cc::TransferableResource resource;
   resource.id = 1;
-  resources.push_back(resource);
-  view_->ReturnResources(resources);
+  frame.resource_list.push_back(resource);
+  view_->OnSwapCompositorFrame(0, std::move(frame));
   EXPECT_EQ(0u, sink_->message_count());
 
   // Swap another CompositorFrame but this time from another
-  // compositor_frame_sink_id. The resources held by DelegatedFrameHost are old
-  // and should not be returned.
+  // compositor_frame_sink_id. The resources for the previous frame are old and
+  // should not be returned.
   view_->OnSwapCompositorFrame(1,
                                MakeDelegatedFrame(1.f, view_size, view_rect));
   EXPECT_EQ(0u, sink_->message_count());
 
   // Report that the surface is drawn to trigger an ACK.
   cc::Surface* surface = manager->GetSurfaceForId(view_->surface_id());
   EXPECT_TRUE(surface);
   surface->RunDrawCallbacks();
   EXPECT_EQ(1u, sink_->message_count());
   {
@@ skipping 2888 matching lines @@
     // There is no composition in the beginning.
     EXPECT_FALSE(has_composition_text());
     SetHasCompositionTextToTrue();
     view->ImeCancelComposition();
     // The composition must have been canceled.
     EXPECT_FALSE(has_composition_text());
   }
 }
 
 }  // namespace content