cc: Do not save the rasterScale for layers until they are finished animating transforms.

cc/layer_animation_controller_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 "config.h"
 
 #include "cc/layer_animation_controller.h"
 
 #include "cc/active_animation.h"
 #include "cc/animation_curve.h"
@@ skipping 108 matching lines @@
 
 TEST(LayerAnimationControllerTest, doNotSyncFinishedAnimation)
 {
     FakeLayerAnimationControllerClient dummyImpl;
     scoped_ptr<LayerAnimationController> controllerImpl(LayerAnimationController::create(&dummyImpl));
     FakeLayerAnimationControllerClient dummy;
     scoped_ptr<LayerAnimationController> controller(LayerAnimationController::create(&dummy));
 
     EXPECT_FALSE(controllerImpl->getActiveAnimation(0, ActiveAnimation::Opacity));
 
-    addOpacityTransitionToController(*controller, 1, 0, 1, false);
+    int animationId = addOpacityTransitionToController(*controller, 1, 0, 1, false);
 
     controller->pushAnimationUpdatesTo(controllerImpl.get());
 
     EXPECT_TRUE(controllerImpl->getActiveAnimation(0, ActiveAnimation::Opacity));
     EXPECT_EQ(ActiveAnimation::WaitingForTargetAvailability, controllerImpl->getActiveAnimation(0, ActiveAnimation::Opacity)->runState());
 
     // Notify main thread controller that the animation has started.
     AnimationEvent animationStartedEvent(AnimationEvent::Started, 0, 0, ActiveAnimation::Opacity, 0);
     controller->notifyAnimationStarted(animationStartedEvent);
 
     // Force animation to complete on impl thread.
-    controllerImpl->removeAnimation(0);
+    controllerImpl->removeAnimation(animationId);
 
-    EXPECT_FALSE(controllerImpl->getActiveAnimation(0, ActiveAnimation::Opacity));
+    EXPECT_FALSE(controllerImpl->getActiveAnimation(animationId, ActiveAnimation::Opacity));
 
     controller->pushAnimationUpdatesTo(controllerImpl.get());
 
     // Even though the main thread has a 'new' animation, it should not be pushed because the animation has already completed on the impl thread.
-    EXPECT_FALSE(controllerImpl->getActiveAnimation(0, ActiveAnimation::Opacity));
+    EXPECT_FALSE(controllerImpl->getActiveAnimation(animationId, ActiveAnimation::Opacity));
 }
 
 // Tests that transitioning opacity from 0 to 1 works as expected.
 TEST(LayerAnimationControllerTest, TrivialTransition)
 {
     scoped_ptr<AnimationEventsVector> events(make_scoped_ptr(new AnimationEventsVector));
     FakeLayerAnimationControllerClient dummy;
     scoped_ptr<LayerAnimationController> controller(
         LayerAnimationController::create(&dummy));
 
@@ skipping 393 matching lines @@
     controller->setForceSync();
 
     controller->pushAnimationUpdatesTo(controllerImpl.get());
 
     activeAnimation = controllerImpl->getActiveAnimation(0, ActiveAnimation::Opacity);
     EXPECT_TRUE(activeAnimation);
     EXPECT_EQ(ActiveAnimation::WaitingForTargetAvailability, activeAnimation->runState());
 }
 
 }  // anonymous namespace