cc: Use BeginFrameArgs

cc/trees/layer_tree_host_unittest_animation.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/trees/layer_tree_host.h"
 
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/animation/timing_function.h"
 #include "cc/layers/layer.h"
@@ skipping 246 matching lines @@
 class LayerTreeHostAnimationTestTickAnimationWhileBackgrounded
     : public LayerTreeHostAnimationTest {
  public:
   LayerTreeHostAnimationTestTickAnimationWhileBackgrounded()
       : num_animates_(0) {}
 
   virtual void BeginTest() OVERRIDE {
     PostAddAnimationToMainThread(layer_tree_host()->root_layer());
   }
 
+  virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+    if (num_animates_ == 1)
+        PostSetVisibleToMainThread(false);
+  }
+
   // Use WillAnimateLayers to set visible false before the animation runs and
   // causes a commit, so we block the second visible animate in single-thread
   // mode.
   virtual void WillAnimateLayers(
       LayerTreeHostImpl* host_impl,
       base::TimeTicks monotonic_time) OVERRIDE {
-    if (num_animates_ < 2) {
-      if (!num_animates_) {
-        // We have a long animation running. It should continue to tick even
-        // if we are not visible.
-        PostSetVisibleToMainThread(false);
-      }
+    if (num_animates_ < 3) {
       num_animates_++;
       return;
     }
     EndTest();
   }
 
   virtual void AfterTest() OVERRIDE {}
 
  private:
   int num_animates_;
@@ skipping 15 matching lines @@
     layer_tree_host()->root_layer()->AddChild(content_);
   }
 
   virtual void BeginTest() OVERRIDE {
     PostAddAnimationToMainThread(content_.get());
   }
 
   virtual void AnimateLayers(
       LayerTreeHostImpl* host_impl,
       base::TimeTicks monotonic_time) OVERRIDE {
+    if (!host_impl->active_tree()->root_layer())
+      return;
     LayerAnimationController* controller_impl =
         host_impl->active_tree()->root_layer()->children()[0]->
         layer_animation_controller();
     Animation* animation =
         controller_impl->GetAnimation(Animation::Opacity);
     if (!animation)
       return;
 
     const FloatAnimationCurve* curve =
         animation->curve()->ToFloatAnimationCurve();
@@ skipping 49 matching lines @@
     main_start_time_ = animation->start_time();
     controller->RemoveAnimation(animation->id());
 
     if (impl_start_time_ > 0.0)
       EndTest();
   }
 
   virtual void UpdateAnimationState(
       LayerTreeHostImpl* impl_host,
       bool has_unfinished_animation) OVERRIDE {
+    if (!impl_host->active_tree()->root_layer())
+      return;
+
     LayerAnimationController* controller =
         impl_host->active_tree()->root_layer()->children()[0]->
         layer_animation_controller();
     Animation* animation =
         controller->GetAnimation(Animation::Opacity);
     if (!animation)
       return;
 
     impl_start_time_ = animation->start_time();
     controller->RemoveAnimation(animation->id());
@@ skipping 341 matching lines @@
   virtual void DispatchAddInstantAnimation(Layer* layer_to_receive_animation)
       OVERRIDE {
     LayerTreeHostAnimationTest::DispatchAddInstantAnimation(
         layer_to_receive_animation);
     added_animations_++;
   }
 
   virtual bool PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                      LayerTreeHostImpl::FrameData* frame_data,
                                      bool result) OVERRIDE {
-    if (added_animations_ < 2)
+    if (host_impl->active_tree()->source_frame_number() < 2)
       return result;
     if (TestEnded())
       return result;
     // Act like there is checkerboard when the second animation wants to draw.
     ++prevented_draw_;
+    if (finished_times_)
+      EndTest();
     return false;
   }
 
-  virtual void DidCommitAndDrawFrame() OVERRIDE {
+  virtual void DidCommit() OVERRIDE {
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
         // The animation is longer than 1 BeginFrame interval.
         AddOpacityTransitionToLayer(content_.get(), 0.1, 0.2f, 0.8f, false);
         added_animations_++;
         break;
       case 2:
         // This second animation will not be drawn so it should not start.
         AddAnimatedTransformToLayer(content_.get(), 0.1, 5, 5);
         added_animations_++;
         break;
     }
   }
 
   virtual void NotifyAnimationStarted(double wall_clock_time) OVERRIDE {
     if (TestEnded())
       return;
     started_times_++;
   }
 
   virtual void NotifyAnimationFinished(double wall_clock_time) OVERRIDE {
     // We should be checkerboarding already, but it should still finish the
     // first animation.
-    EXPECT_EQ(2, added_animations_);
     finished_times_++;
-    EndTest();
+    if (prevented_draw_)
+      EndTest();
   }
 
   virtual void AfterTest() OVERRIDE {
     // Make sure we tried to draw the second animation but failed.
     EXPECT_LT(0, prevented_draw_);
     // The first animation should be started, but the second should not because
     // of checkerboard.
     EXPECT_EQ(1, started_times_);
     // The first animation should still be finished.
     EXPECT_EQ(1, finished_times_);
   }
 
   int prevented_draw_;
   int added_animations_;
   int started_times_;
   int finished_times_;
   FakeContentLayerClient client_;
   scoped_refptr<FakeContentLayer> content_;
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestCheckerboardDoesntStartAnimations);
 
 }  // namespace
 }  // namespace cc