cc: Make LayerTreeHostImpl::SwapBuffers not virtual.

cc/test/fake_output_surface.h

 // 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.
 
 #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_
 #define CC_TEST_FAKE_OUTPUT_SURFACE_H_
 
 #include <stddef.h>
 
 #include "base/callback.h"
@@ skipping 91 matching lines @@
     capabilities_.max_frames_pending = max;
   }
 
   CompositorFrame* last_sent_frame() { return last_sent_frame_.get(); }
   size_t num_sent_frames() { return num_sent_frames_; }
 
   void SwapBuffers(CompositorFrame frame) override;
 
   OutputSurfaceClient* client() { return client_; }
   bool BindToClient(OutputSurfaceClient* client) override;
+  void DetachFromClient() override;
 
   void set_framebuffer(GLint framebuffer, GLenum format) {
     framebuffer_ = framebuffer;
     framebuffer_format_ = format;
   }
   void BindFramebuffer() override;
   uint32_t GetFramebufferCopyTextureFormat() override;
 
   void SetTreeActivationCallback(const base::Closure& callback);
 
   const TransferableResourceArray& resources_held_by_parent() {
     return resources_held_by_parent_;
   }
 
-  void ReturnResource(unsigned id, CompositorFrameAck* ack);
-
   bool HasExternalStencilTest() const override;
 
   bool SurfaceIsSuspendForRecycle() const override;
 
   OverlayCandidateValidator* GetOverlayCandidateValidator() const override;
   void SetOverlayCandidateValidator(OverlayCandidateValidator* validator) {
     overlay_candidate_validator_ = validator;
   }
 
   void set_has_external_stencil_test(bool has_test) {
     has_external_stencil_test_ = has_test;
   }
 
   void set_suspended_for_recycle(bool suspended) {
     suspended_for_recycle_ = suspended;
   }
 
   void SetMemoryPolicyToSetAtBind(
       std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind);
 
   gfx::Rect last_swap_rect() const {
     return last_swap_rect_;
   }
 
+  void ReturnResourcesHeldByParent();
+
  protected:
   FakeOutputSurface(scoped_refptr<ContextProvider> context_provider,
                     scoped_refptr<ContextProvider> worker_context_provider,
                     bool delegated_rendering);
 
   FakeOutputSurface(std::unique_ptr<SoftwareOutputDevice> software_device,
                     bool delegated_rendering);
 
   FakeOutputSurface(scoped_refptr<ContextProvider> context_provider,
                     scoped_refptr<ContextProvider> worker_context_provider,
                     std::unique_ptr<SoftwareOutputDevice> software_device,
                     bool delegated_rendering);
 
   OutputSurfaceClient* client_ = nullptr;
   std::unique_ptr<CompositorFrame> last_sent_frame_;
   size_t num_sent_frames_ = 0;
   bool has_external_stencil_test_ = false;
   bool suspended_for_recycle_ = false;
   GLint framebuffer_ = 0;
   GLenum framebuffer_format_ = 0;
   TransferableResourceArray resources_held_by_parent_;
   std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind_;
   OverlayCandidateValidator* overlay_candidate_validator_ = nullptr;
   gfx::Rect last_swap_rect_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_FAKE_OUTPUT_SURFACE_H_