cc: Use BeginFrameArgs

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 <string>
 
 #include "base/callback.h"
 #include "cc/layers/texture_layer_client.h"
@@ skipping 822 matching lines @@
     {
       base::AutoLock lock(lock_);
       expected_used_textures_on_commit_ = 1;
     }
   }
 
   virtual void BeginTest() OVERRIDE {
     PostSetNeedsCommitToMainThread();
   }
 
-  virtual void DidCommitAndDrawFrame() OVERRIDE {
+  virtual void DidCommit() OVERRIDE {

[enne (OOO), 2013/08/02 19:41:25]

This test seems like it depends on PrepareToDrawOnThread resetting used
textures, and changing this function to DidCommit might make it flaky.

[brianderson, 2013/08/02 23:04:31]

I changed a number of DidCommitAndDrawFrame's to DidCommit's because delaying
the first draw after OutputSurfaceInitialization till after activation
introduced race conditions in existing tests that depended on the
source_frame_number on the Main thread. I got a little too trigger happy here.

     ++commit_count_;
     switch (commit_count_) {
       case 1:
         texture_layer_->ClearClient();
         texture_layer_->SetNeedsDisplay();
         {
           base::AutoLock lock(lock_);
           expected_used_textures_on_commit_ = 0;
         }
         texture_ = 0;
@@ skipping 102 matching lines @@
     LayerImpl* root = host_impl->RootLayer();
     TextureLayerImpl* texture_layer =
         static_cast<TextureLayerImpl*>(root->children()[0]);
     if (++draw_count_ == 1)
       EXPECT_EQ(0u, texture_layer->texture_id());
     else
       EXPECT_EQ(texture_, texture_layer->texture_id());
     return true;
   }
 
-  virtual void DidCommitAndDrawFrame() OVERRIDE {
+  virtual void DidCommit() OVERRIDE {

[enne (OOO), 2013/08/02 19:41:25]

There's test logic in PrepareToDrawOnThread that seems like it could be skipped
if you make this change?

[brianderson, 2013/08/02 23:04:31]

Trigger happy again. Fixed.

     EndTest();
   }
 
   virtual void AfterTest() OVERRIDE {}
 
  private:
   scoped_refptr<TextureLayer> texture_layer_;
   scoped_ptr<TestWebGraphicsContext3D> texture_context_;
   unsigned texture_;
   int draw_count_;
@@ skipping 38 matching lines @@
   virtual void BeginTest() OVERRIDE {
     callback_count_ = 0;
 
     // Set the mailbox on the main thread.
     SetMailbox('1');
     EXPECT_EQ(0, callback_count_);
 
     PostSetNeedsCommitToMainThread();
   }
 
-  virtual void DidCommitAndDrawFrame() OVERRIDE {
+  virtual void DidCommit() OVERRIDE {
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
         // Delete the TextureLayer on the main thread while the mailbox is in
         // the impl tree.
         layer_->RemoveFromParent();
         layer_ = NULL;
         break;
     }
   }
 
@@ skipping 47 matching lines @@
   virtual void BeginTest() OVERRIDE {
     callback_count_ = 0;
 
     // Set the mailbox on the main thread.
     SetMailbox('1');
     EXPECT_EQ(0, callback_count_);
 
     PostSetNeedsCommitToMainThread();
   }
 
-  virtual void DidCommitAndDrawFrame() OVERRIDE {
+  virtual void DidCommit() OVERRIDE {
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
         // Remove the TextureLayer on the main thread while the mailbox is in
         // the impl tree, but don't delete the TextureLayer until after the impl
         // tree side is deleted.
         layer_->RemoveFromParent();
         break;
       case 2:
         layer_ = NULL;
         break;
     }
   }
 
   virtual void AfterTest() OVERRIDE {
     EXPECT_EQ(1, callback_count_);
   }
 
  private:
   int callback_count_;
   scoped_refptr<Layer> root_;
   scoped_refptr<TextureLayer> layer_;
 };
 
 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
     TextureLayerWithMailboxImplThreadDeleted);
 
 }  // namespace
 }  // namespace cc