cc: Make animations tick regardless of drawing.

cc/test/layer_tree_test.cc

 // Copyright 2011 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/test/layer_tree_test.h"
 
 #include "base/command_line.h"
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_registrar.h"
 #include "cc/animation/layer_animation_controller.h"
@@ skipping 133 matching lines @@
     test_hooks_->DidSetVisibleOnImplTree(this, visible);
   }
 
   virtual void AnimateLayers(base::TimeTicks monotonic_time,
                              base::Time wall_clock_time) OVERRIDE {
     test_hooks_->WillAnimateLayers(this, monotonic_time);
     LayerTreeHostImpl::AnimateLayers(monotonic_time, wall_clock_time);
     test_hooks_->AnimateLayers(this, monotonic_time);
   }
 
-  virtual void UpdateAnimationState() OVERRIDE {
-    LayerTreeHostImpl::UpdateAnimationState();
+  virtual void UpdateAnimationState(bool start_ready_animations) OVERRIDE {
+    LayerTreeHostImpl::UpdateAnimationState(start_ready_animations);
     bool has_unfinished_animation = false;
     AnimationRegistrar::AnimationControllerMap::const_iterator iter =
         active_animation_controllers().begin();
     for (; iter != active_animation_controllers().end(); ++iter) {
       if (iter->second->HasActiveAnimation()) {
         has_unfinished_animation = true;
         break;
       }
     }
     test_hooks_->UpdateAnimationState(this, has_unfinished_animation);
@@ skipping 173 matching lines @@
 }
 
 void LayerTreeTest::PostAddAnimationToMainThread(
     Layer* layer_to_receive_animation) {
   proxy()->MainThread()->PostTask(
       base::Bind(&LayerTreeTest::DispatchAddAnimation,
                  main_thread_weak_ptr_,
                  base::Unretained(layer_to_receive_animation)));
 }
 
-void LayerTreeTest::PostAddInstantAnimationToMainThread() {
+void LayerTreeTest::PostAddInstantAnimationToMainThread(
+    Layer* layer_to_receive_animation) {
   proxy()->MainThread()->PostTask(
       base::Bind(&LayerTreeTest::DispatchAddInstantAnimation,
-                 main_thread_weak_ptr_));
+                 main_thread_weak_ptr_,
+                 base::Unretained(layer_to_receive_animation)));
 }
 
 void LayerTreeTest::PostSetNeedsCommitToMainThread() {
   proxy()->MainThread()->PostTask(
       base::Bind(&LayerTreeTest::DispatchSetNeedsCommit,
                  main_thread_weak_ptr_));
 }
 
 void LayerTreeTest::PostAcquireLayerTextures() {
   proxy()->MainThread()->PostTask(
@@ skipping 76 matching lines @@
 
   if (layer_tree_host_ && proxy()->CommitPendingForTesting()) {
     proxy()->MainThread()->PostTask(
         base::Bind(&LayerTreeTest::RealEndTest, main_thread_weak_ptr_));
     return;
   }
 
   MessageLoop::current()->Quit();
 }
 
-void LayerTreeTest::DispatchAddInstantAnimation() {
+void LayerTreeTest::DispatchAddInstantAnimation(
+    Layer* layer_to_receive_animation) {
   DCHECK(!proxy() || proxy()->IsMainThread());
 
-  if (layer_tree_host_.get() && layer_tree_host_->root_layer()) {
-    AddOpacityTransitionToLayer(layer_tree_host_->root_layer(),
+  if (layer_to_receive_animation) {
+    AddOpacityTransitionToLayer(layer_to_receive_animation,
                                 0,
                                 0,
                                 0.5,
                                 false);
   }
 }
 
 void LayerTreeTest::DispatchAddAnimation(Layer* layer_to_receive_animation) {
   DCHECK(!proxy() || proxy()->IsMainThread());
 
-  if (layer_to_receive_animation)
-    AddOpacityTransitionToLayer(layer_to_receive_animation, 10, 0, 0.5, true);
+  if (layer_to_receive_animation) {
+    AddOpacityTransitionToLayer(layer_to_receive_animation,
+                                0.000001,
+                                0,
+                                0.5,
+                                true);
+  }
 }
 
 void LayerTreeTest::DispatchSetNeedsCommit() {
   DCHECK(!proxy() || proxy()->IsMainThread());
 
   if (layer_tree_host_)
     layer_tree_host_->SetNeedsCommit();
 }
 
 void LayerTreeTest::DispatchAcquireLayerTextures() {
@@ skipping 31 matching lines @@
     return;
 
   // If the LTH is not visible, defer the composite until the LTH is made
   // visible.
   if (!layer_tree_host_->visible()) {
     schedule_when_set_visible_true_ = true;
     return;
   }
 
   schedule_when_set_visible_true_ = false;
-  layer_tree_host_->Composite(base::TimeTicks::Now());
+  base::TimeTicks now = base::TimeTicks::Now();
+  layer_tree_host_->UpdateAnimations(now);
+  layer_tree_host_->Composite(now);
 }
 
 void LayerTreeTest::RunTest(bool threaded) {
   if (threaded) {
     impl_thread_.reset(new base::Thread("LayerTreeTest"));
     ASSERT_TRUE(impl_thread_->Start());
   }
 
   main_ccthread_ = cc::ThreadImpl::CreateForCurrentThread();
 
@@ skipping 19 matching lines @@
   ASSERT_FALSE(layer_tree_host_.get());
   client_.reset();
   if (timed_out_) {
     FAIL() << "Test timed out";
     return;
   }
   AfterTest();
 }
 
 }  // namespace cc