Revert of Remove ForceReclaimResources

cc/surfaces/direct_compositor_frame_sink.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 "cc/surfaces/direct_compositor_frame_sink.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_sink_client.h"
 #include "cc/surfaces/display.h"
@@ skipping 14 matching lines @@
     SharedBitmapManager* shared_bitmap_manager)
     : CompositorFrameSink(std::move(context_provider),
                           std::move(worker_context_provider),
                           gpu_memory_buffer_manager,
                           shared_bitmap_manager),
       frame_sink_id_(frame_sink_id),
       surface_manager_(surface_manager),
       display_(display),
       factory_(frame_sink_id, surface_manager, this) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  capabilities_.must_always_swap = true;
+  capabilities_.can_force_reclaim_resources = true;
   // Display and DirectCompositorFrameSink share a GL context, so sync
   // points aren't needed when passing resources between them.
   capabilities_.delegated_sync_points_required = false;
   factory_.set_needs_sync_points(false);
 }
 
 DirectCompositorFrameSink::DirectCompositorFrameSink(
     const FrameSinkId& frame_sink_id,
     SurfaceManager* surface_manager,
     Display* display,
     scoped_refptr<VulkanContextProvider> vulkan_context_provider)
     : CompositorFrameSink(std::move(vulkan_context_provider)),
       frame_sink_id_(frame_sink_id),
       surface_manager_(surface_manager),
       display_(display),
       factory_(frame_sink_id_, surface_manager, this) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  capabilities_.must_always_swap = true;
+  capabilities_.can_force_reclaim_resources = true;
 }
 
 DirectCompositorFrameSink::~DirectCompositorFrameSink() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 bool DirectCompositorFrameSink::BindToClient(
     CompositorFrameSinkClient* client) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ skipping 31 matching lines @@
   }
   display_->SetLocalFrameId(delegated_local_frame_id_,
                             frame.metadata.device_scale_factor);
 
   factory_.SubmitCompositorFrame(
       delegated_local_frame_id_, std::move(frame),
       base::Bind(&DirectCompositorFrameSink::DidDrawCallback,
                  base::Unretained(this)));
 }
 
+void DirectCompositorFrameSink::ForceReclaimResources() {
+  if (delegated_local_frame_id_.is_valid())
+    factory_.ClearSurface();
+}
+
 void DirectCompositorFrameSink::ReturnResources(
     const ReturnedResourceArray& resources) {
   if (client_)
     client_->ReclaimResources(resources);
 }
 
 void DirectCompositorFrameSink::SetBeginFrameSource(
     BeginFrameSource* begin_frame_source) {
   DCHECK(client_);
   client_->SetBeginFrameSource(begin_frame_source);
@@ skipping 14 matching lines @@
   // This notification is not relevant to our client outside of tests. We
   // unblock the client from DidDrawCallback() when the surface is going to
   // be drawn.
 }
 
 void DirectCompositorFrameSink::DidDrawCallback() {
   client_->DidReceiveCompositorFrameAck();
 }
 
 }  // namespace cc