Ref count layer animation controllers.

cc/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/layer_tree_host.h"
 
 #include "cc/animation_curve.h"
 #include "cc/layer.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
@@ skipping 106 matching lines @@
       , received_animation_started_notification_(false)
       , start_time_(0) {
   }
 
   virtual void beginTest() OVERRIDE {
     postAddInstantAnimationToMainThread();
   }
 
   virtual void animateLayers(
       LayerTreeHostImpl* impl_host,
-      base::TimeTicks monotonic_time) OVERRIDE {
+      base::TimeTicks monotonic_time,
+      bool hasUnfinishedAnimation) OVERRIDE {
     if (!num_animates_) {
       // The animation had zero duration so layerTreeHostImpl should no
       // longer need to animate its layers.
-      EXPECT_FALSE(impl_host->needsAnimateLayers());
+      EXPECT_FALSE(hasUnfinishedAnimation);
       num_animates_++;
       first_monotonic_time_ = monotonic_time;
       return;
     }
     EXPECT_LT(0, start_time_);
     EXPECT_TRUE(received_animation_started_notification_);
     endTest();
   }
 
   virtual void notifyAnimationStarted(double wall_clock_time) OVERRIDE {
@@ skipping 20 matching lines @@
   LayerTreeHostAnimationTestCheckerboardDoesNotStarveDraws()
       : started_animating_(false) {
   }
 
   virtual void beginTest() OVERRIDE {
     postAddAnimationToMainThread(m_layerTreeHost->rootLayer());
   }
 
   virtual void animateLayers(
       LayerTreeHostImpl* host_impl,
-      base::TimeTicks monotonicTime) OVERRIDE {
+      base::TimeTicks monotonicTime,
+      bool hasUnfinishedAnimation) OVERRIDE {
     started_animating_ = true;
   }
 
   virtual void drawLayersOnThread(LayerTreeHostImpl*) OVERRIDE {
     if (started_animating_)
       endTest();
   }
 
   virtual bool prepareToDrawOnThread(LayerTreeHostImpl*) OVERRIDE {
     return false;
@@ skipping 52 matching lines @@
     public LayerTreeHostAnimationTest {
 public:
   LayerTreeHostAnimationTestAddAnimationWithTimingFunction() {}
 
   virtual void beginTest() OVERRIDE {
     postAddAnimationToMainThread(m_layerTreeHost->rootLayer());
   }
 
   virtual void animateLayers(
       LayerTreeHostImpl* host_impl,
-      base::TimeTicks monotonicTime) OVERRIDE {
+      base::TimeTicks monotonicTime,
+      bool hasUnfinishedAnimation) OVERRIDE {
     LayerAnimationController* controller =
         m_layerTreeHost->rootLayer()->layerAnimationController();
     ActiveAnimation* animation =
         controller->getActiveAnimation(0, ActiveAnimation::Opacity);
     if (!animation)
       return;
 
     const FloatAnimationCurve* curve =
         animation->curve()->toFloatAnimationCurve();
     float startOpacity = curve->getValue(0);
@@ skipping 43 matching lines @@
         controller->getActiveAnimation(0, ActiveAnimation::Opacity);
     main_start_time_ = animation->startTime();
     controller->removeAnimation(animation->id());
 
     if (impl_start_time_ > 0)
       endTest();
   }
 
   virtual void animateLayers(
       LayerTreeHostImpl* impl_host,
-      base::TimeTicks monotonicTime) OVERRIDE {
+      base::TimeTicks monotonicTime,
+      bool hasUnfinishedAnimation) OVERRIDE {
     LayerAnimationController* controller =
         impl_host->rootLayer()->layerAnimationController();
     ActiveAnimation* animation =
         controller->getActiveAnimation(0, ActiveAnimation::Opacity);
     if (!animation)
       return;
 
     impl_start_time_ = animation->startTime();
     controller->removeAnimation(animation->id());
 
@@ skipping 75 matching lines @@
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestDoNotSkipLayersWithAnimatedOpacity)
 
 // Layers added to tree with existing active animations should have the
 // animation correctly recognized.
 class LayerTreeHostAnimationTestLayerAddedWithAnimation :
     public LayerTreeHostAnimationTest {
  public:
-  LayerTreeHostAnimationTestLayerAddedWithAnimation()
-      : added_animation_(false) {
+  LayerTreeHostAnimationTestLayerAddedWithAnimation() { }
+
+  virtual void beginTest() OVERRIDE {
+    postSetNeedsCommitToMainThread();
   }
 
-  virtual void beginTest() OVERRIDE {
-    EXPECT_FALSE(added_animation_);
+  virtual void didCommit() OVERRIDE {
+    if (m_layerTreeHost->commitNumber() == 1) {
+      scoped_refptr<Layer> layer = Layer::create();
+      layer->setLayerAnimationDelegate(this);
 
-    scoped_refptr<Layer> layer = Layer::create();
-    layer->setLayerAnimationDelegate(this);
+      // Any valid AnimationCurve will do here.
+      scoped_ptr<AnimationCurve> curve(EaseTimingFunction::create());
+      scoped_ptr<ActiveAnimation> animation(
+          ActiveAnimation::create(curve.Pass(), 1, 1,
+                                  ActiveAnimation::Opacity));
+      layer->layerAnimationController()->addAnimation(animation.Pass());
 
-    // Any valid AnimationCurve will do here.
-    scoped_ptr<AnimationCurve> curve(EaseTimingFunction::create());
-    scoped_ptr<ActiveAnimation> animation(
-        ActiveAnimation::create(curve.Pass(), 1, 1, ActiveAnimation::Opacity));
-    layer->layerAnimationController()->addAnimation(animation.Pass());
+      // We add the animation *before* attaching the layer to the tree.
+      m_layerTreeHost->rootLayer()->addChild(layer);
+    }
+  }
 
-    // We add the animation *before* attaching the layer to the tree.
-    m_layerTreeHost->rootLayer()->addChild(layer);
-    EXPECT_TRUE(added_animation_);
-
+  virtual void animateLayers(
+      LayerTreeHostImpl* impl_host,
+      base::TimeTicks monotonic_time,
+      bool hasUnfinishedAnimation) OVERRIDE {
     endTest();
   }
 
-  virtual void didAddAnimation() OVERRIDE {
-    added_animation_ = true;
-  }
-
   virtual void afterTest() OVERRIDE {}
-
-private:
-  bool added_animation_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestLayerAddedWithAnimation)
 
 class LayerTreeHostAnimationTestCompositeAndReadbackAnimateCount :
     public LayerTreeHostAnimationTest {
  public:
   LayerTreeHostAnimationTestCompositeAndReadbackAnimateCount()
       : animated_commit_(-1) {
@@ skipping 82 matching lines @@
 
  private:
   int num_commit_complete_;
   int num_draw_layers_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestContinuousAnimate)
 
 }  // namespace
 }  // namespace cc