cc: Make LayerTreeHostImpl::SwapBuffers not virtual.

cc/layers/texture_layer_unittest.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/layers/texture_layer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1048 matching lines @@
 
     *texture_mailbox = TextureMailbox(MailboxFromChar('1'),
                                       SyncTokenFromUInt(0x123), GL_TEXTURE_2D);
     *release_callback = SingleReleaseCallback::Create(
         base::Bind(&TextureLayerNoExtraCommitForMailboxTest::MailboxReleased,
                    base::Unretained(this)));
     return true;
   }
 
   void MailboxReleased(const gpu::SyncToken& sync_token, bool lost_resource) {
-    // Source frame number during callback is the same as the source frame

[danakj, 2016/07/13 21:50:17]

Resources are now returned asynchronously from anything LTHI is doing, so we
can't compare to the source frame number. The point of this test is that we
don't do another commit tho (the NOTREACHED() on 1103), so just removing this.

-    // on which it was released.
-    EXPECT_EQ(1, layer_tree_host()->source_frame_number());
     EXPECT_TRUE(sync_token.HasData());
     EndTest();
   }
 
   void SetupTree() override {
     scoped_refptr<Layer> root = Layer::Create();
     root->SetBounds(gfx::Size(10, 10));
     root->SetIsDrawable(true);
 
     texture_layer_ = TextureLayer::CreateForMailbox(this);
@@ skipping 16 matching lines @@
         texture_layer_->SetNeedsDisplay();
         break;
       case 2:
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 
-  void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
-    ASSERT_TRUE(result);
-    DelegatedFrameData* delegated_frame_data =
-        output_surface()->last_sent_frame()->delegated_frame_data.get();
-    if (!delegated_frame_data)
-      return;
-
-    // Return all resources immediately.

[danakj, 2016/07/13 21:50:17]

This moved into FakeOutputSurface to happen automatically when a frame is
swapped to the previous frame, and to the last frame on shutdown.

-    TransferableResourceArray resources_to_return =
-        output_surface()->resources_held_by_parent();
-
-    CompositorFrameAck ack;
-    for (size_t i = 0; i < resources_to_return.size(); ++i)
-      output_surface()->ReturnResource(resources_to_return[i].id, &ack);
-    host_impl->ReclaimResources(&ack);
-  }
-
   void AfterTest() override {}
 
  private:
   scoped_refptr<TextureLayer> texture_layer_;
 };
 
-SINGLE_AND_MULTI_THREAD_TEST_F(TextureLayerNoExtraCommitForMailboxTest);
+SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(
+    TextureLayerNoExtraCommitForMailboxTest);
 
 // Checks that changing a mailbox in the client for a TextureLayer that's
 // invisible correctly works and uses the new mailbox as soon as the layer
 // becomes visible (and returns the old one).
 class TextureLayerChangeInvisibleMailboxTest
     : public LayerTreeTest,
       public TextureLayerClient {
  public:
   TextureLayerChangeInvisibleMailboxTest()
       : mailbox_changed_(true),
@@ skipping 93 matching lines @@
       case 5:
         EXPECT_EQ(2, mailbox_returned_);
         EndTest();
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 
-  void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
-    ASSERT_TRUE(result);
-    DelegatedFrameData* delegated_frame_data =
-        output_surface()->last_sent_frame()->delegated_frame_data.get();
-    if (!delegated_frame_data)
-      return;
-
-    // Return all resources immediately.
-    TransferableResourceArray resources_to_return =
-        output_surface()->resources_held_by_parent();
-
-    CompositorFrameAck ack;
-    for (size_t i = 0; i < resources_to_return.size(); ++i)
-      output_surface()->ReturnResource(resources_to_return[i].id, &ack);
-    host_impl->ReclaimResources(&ack);
-  }
-
   void AfterTest() override {}
 
  private:
   scoped_refptr<SolidColorLayer> solid_layer_;
   scoped_refptr<Layer> parent_layer_;
   scoped_refptr<TextureLayer> texture_layer_;
 
   // Used on the main thread.
   bool mailbox_changed_;
   TextureMailbox mailbox_;
@@ skipping 217 matching lines @@
   int callback_count_;
   scoped_refptr<Layer> root_;
   scoped_refptr<TextureLayer> layer_;
 };
 
 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
     TextureLayerWithMailboxImplThreadDeleted);
 
 }  // namespace
 }  // namespace cc