Remove ForceReclaimResources

cc/test/test_compositor_frame_sink.cc

 // Copyright 2016 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 "cc/test/test_compositor_frame_sink.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/compositor_frame_sink_client.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/texture_mailbox_deleter.h"
 
 namespace cc {
 
 static constexpr FrameSinkId kCompositorFrameSinkId(1, 1);
 
 TestCompositorFrameSink::TestCompositorFrameSink(
     scoped_refptr<ContextProvider> compositor_context_provider,
     scoped_refptr<ContextProvider> worker_context_provider,
     SharedBitmapManager* shared_bitmap_manager,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     const RendererSettings& renderer_settings,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-    bool synchronous_composite,
-    bool force_disable_reclaim_resources)
+    bool synchronous_composite)
     : CompositorFrameSink(std::move(compositor_context_provider),
                           std::move(worker_context_provider),
                           gpu_memory_buffer_manager,
                           shared_bitmap_manager),
       synchronous_composite_(synchronous_composite),
       renderer_settings_(renderer_settings),
       task_runner_(std::move(task_runner)),
       frame_sink_id_(kCompositorFrameSinkId),
       surface_manager_(new SurfaceManager),
       surface_id_allocator_(new SurfaceIdAllocator()),
       surface_factory_(
           new SurfaceFactory(frame_sink_id_, surface_manager_.get(), this)),
       weak_ptr_factory_(this) {
-  // Since this CompositorFrameSink and the Display are tightly coupled and in
-  // the same process/thread, the LayerTreeHostImpl can reclaim resources from
-  // the Display. But we allow tests to disable this to mimic an out-of-process
-  // Display.
-  capabilities_.can_force_reclaim_resources = !force_disable_reclaim_resources;
   // Always use sync tokens so that code paths in resource provider that deal
   // with sync tokens are tested.
   capabilities_.delegated_sync_points_required = true;
 }
 
 TestCompositorFrameSink::~TestCompositorFrameSink() {
   DCHECK(copy_requests_.empty());
 }
 
 void TestCompositorFrameSink::RequestCopyOfOutput(
@@ skipping 106 matching lines @@
                                       weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 void TestCompositorFrameSink::DidDrawCallback() {
   // This is to unthrottle the next frame, not actually a notice that drawing is
   // done.
   client_->DidReceiveCompositorFrameAck();
 }
 
-void TestCompositorFrameSink::ForceReclaimResources() {
-  if (capabilities_.can_force_reclaim_resources &&
-      delegated_local_frame_id_.is_valid()) {
-    surface_factory_->ClearSurface();
-  }
-}
-
 void TestCompositorFrameSink::ReturnResources(
     const ReturnedResourceArray& resources) {
   client_->ReclaimResources(resources);
 }
 
 void TestCompositorFrameSink::SetBeginFrameSource(
     BeginFrameSource* begin_frame_source) {
   client_->SetBeginFrameSource(begin_frame_source);
 }
 
 void TestCompositorFrameSink::DisplayOutputSurfaceLost() {
   client_->DidLoseCompositorFrameSink();
 }
 
 void TestCompositorFrameSink::DisplayWillDrawAndSwap(
     bool will_draw_and_swap,
     const RenderPassList& render_passes) {
   test_client_->DisplayWillDrawAndSwap(will_draw_and_swap, render_passes);
 }
 
 void TestCompositorFrameSink::DisplayDidDrawAndSwap() {
   test_client_->DisplayDidDrawAndSwap();
+  if (force_reclaim_resources_after_swap_ &&
+      delegated_local_frame_id_.is_valid()) {
+    surface_factory_->ClearSurface();

[danakj, 2017/01/04 18:43:38]

Oh I lied, this is now a test-only method. Hm. Would be nice to not have it. Can
the TextureLayerTests just swap a 2nd empty frame after to release resources? Or
if not, can you just submit an empty frame here?

[ericrk, 2017/01/11 19:17:54]

Removed this and added an extra dummy swap in the TextureLayerTest.

+  }
 }
 
 }  // namespace cc