cc: Make LayerTreeHostImpl::SwapBuffers not virtual.

cc/test/fake_output_surface.cc

 // Copyright 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 "cc/test/fake_output_surface.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/output_surface_client.h"
@@ skipping 24 matching lines @@
     scoped_refptr<ContextProvider> context_provider,
     scoped_refptr<ContextProvider> worker_context_provider,
     std::unique_ptr<SoftwareOutputDevice> software_device,
     bool delegated_rendering)
     : OutputSurface(std::move(context_provider),
                     std::move(worker_context_provider),
                     std::move(software_device)) {
   capabilities_.delegated_rendering = delegated_rendering;
 }
 
-FakeOutputSurface::~FakeOutputSurface() {}
+FakeOutputSurface::~FakeOutputSurface() = default;
 
 void FakeOutputSurface::SwapBuffers(CompositorFrame frame) {
+  ReturnResourcesHeldByParent();
+
   std::unique_ptr<CompositorFrame> frame_copy(new CompositorFrame);
   *frame_copy = std::move(frame);
   if (frame_copy->delegated_frame_data || !context_provider()) {
     last_sent_frame_ = std::move(frame_copy);
 
     if (last_sent_frame_->delegated_frame_data) {
       resources_held_by_parent_.insert(
           resources_held_by_parent_.end(),
           last_sent_frame_->delegated_frame_data->resource_list.begin(),
           last_sent_frame_->delegated_frame_data->resource_list.end());
@@ skipping 30 matching lines @@
     if (memory_policy_to_set_at_bind_) {
       client_->SetMemoryPolicy(*memory_policy_to_set_at_bind_.get());
       memory_policy_to_set_at_bind_ = nullptr;
     }
     return true;
   } else {
     return false;
   }
 }
 
+void FakeOutputSurface::DetachFromClient() {
+  ReturnResourcesHeldByParent();
+  OutputSurface::DetachFromClient();
+}
+
 void FakeOutputSurface::SetTreeActivationCallback(
     const base::Closure& callback) {
   DCHECK(client_);
   client_->SetTreeActivationCallback(callback);
 }
 
-void FakeOutputSurface::ReturnResource(unsigned id, CompositorFrameAck* ack) {
-  TransferableResourceArray::iterator it;
-  for (it = resources_held_by_parent_.begin();
-       it != resources_held_by_parent_.end();
-       ++it) {
-    if (it->id == id)
-      break;
-  }
-  DCHECK(it != resources_held_by_parent_.end());
-  ack->resources.push_back(it->ToReturnedResource());
-  resources_held_by_parent_.erase(it);
-}
-
 bool FakeOutputSurface::HasExternalStencilTest() const {
   return has_external_stencil_test_;
 }
 
 bool FakeOutputSurface::SurfaceIsSuspendForRecycle() const {
   return suspended_for_recycle_;
 }
 
 OverlayCandidateValidator* FakeOutputSurface::GetOverlayCandidateValidator()
     const {
   return overlay_candidate_validator_;
 }
 
 void FakeOutputSurface::SetMemoryPolicyToSetAtBind(
     std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind) {
   memory_policy_to_set_at_bind_.swap(memory_policy_to_set_at_bind);
 }
 
+void FakeOutputSurface::ReturnResourcesHeldByParent() {
+  if (last_sent_frame_) {
+    DelegatedFrameData* delegated_frame_data =
+        last_sent_frame_->delegated_frame_data.get();
+    if (delegated_frame_data) {
+      // Return the last frame's resources immediately.
+      CompositorFrameAck ack;
+      for (const auto& resource : resources_held_by_parent_)
+        ack.resources.push_back(resource.ToReturnedResource());
+      resources_held_by_parent_.clear();
+      client_->ReclaimResources(&ack);
+    }
+  }
+}
+
 }  // namespace cc