Thread ui transform animations

ui/compositor/layer_animation_sequence_unittest.cc

 // Copyright (c) 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 "ui/compositor/layer_animation_sequence.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
@@ skipping 12 matching lines @@
 
 // Check that the sequence behaves sanely when it contains no elements.
 TEST(LayerAnimationSequenceTest, NoElement) {
   LayerAnimationSequence sequence;
   base::TimeTicks start_time;
   start_time += base::TimeDelta::FromSeconds(1);
   sequence.set_start_time(start_time);
   EXPECT_TRUE(sequence.IsFinished(start_time));
   EXPECT_TRUE(sequence.properties().size() == 0);
   LayerAnimationElement::AnimatableProperties properties;
-  EXPECT_FALSE(sequence.HasCommonProperty(properties));
+  EXPECT_FALSE(sequence.HasConflictingProperty(properties));
 }
 
 // Check that the sequences progresses the delegate as expected when it contains
 // a single non-threaded element.
 TEST(LayerAnimationSequenceTest, SingleElement) {
   LayerAnimationSequence sequence;
   TestLayerAnimationDelegate delegate;
   float start = 0.0f;
   float middle = 0.5f;
   float target = 1.0f;
@@ skipping 67 matching lines @@
 }
 
 // Check that the sequences progresses the delegate as expected when it contains
 // multiple elements. Note, see the layer animator tests for cyclic sequences.
 TEST(LayerAnimationSequenceTest, MultipleElement) {
   LayerAnimationSequence sequence;
   TestLayerAnimationDelegate delegate;
   float start_opacity = 0.0f;
   float target_opacity = 1.0f;
   base::TimeTicks start_time;
-  base::TimeTicks effective_start;
+  base::TimeTicks opacity_effective_start;
+  base::TimeTicks transform_effective_start;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
   sequence.AddElement(
       LayerAnimationElement::CreateOpacityElement(target_opacity, delta));
 
   // Pause bounds for a second.
   LayerAnimationElement::AnimatableProperties properties;
   properties.insert(LayerAnimationElement::BOUNDS);
 
   sequence.AddElement(
       LayerAnimationElement::CreatePauseElement(properties, delta));
 
   gfx::Transform start_transform, target_transform, middle_transform;
   start_transform.Rotate(-30.0);
   target_transform.Rotate(30.0);
 
   sequence.AddElement(
       LayerAnimationElement::CreateTransformElement(target_transform, delta));
 
   for (int i = 0; i < 2; ++i) {
     int group_id = 1;
     sequence.set_animation_group_id(group_id);
-    start_time = effective_start + 3 * delta;
+    start_time = opacity_effective_start + 4 * delta;
     sequence.set_start_time(start_time);
     delegate.SetOpacityFromAnimation(start_opacity);
     delegate.SetTransformFromAnimation(start_transform);
 
     sequence.Start(&delegate);
     sequence.Progress(start_time, &delegate);
     EXPECT_FLOAT_EQ(0.0, sequence.last_progressed_fraction());
-    effective_start = start_time + delta;
+    opacity_effective_start = start_time + delta;
     sequence.OnThreadedAnimationStarted(cc::AnimationEvent(
         cc::AnimationEvent::Started,
         0,
         group_id,
         cc::Animation::Opacity,
-        (effective_start - base::TimeTicks()).InSecondsF()));
-    sequence.Progress(effective_start + delta/2, &delegate);
+        (opacity_effective_start - base::TimeTicks()).InSecondsF()));
+    sequence.Progress(opacity_effective_start + delta/2, &delegate);
     EXPECT_FLOAT_EQ(0.5, sequence.last_progressed_fraction());
-    sequence.Progress(effective_start + delta, &delegate);
+    sequence.Progress(opacity_effective_start + delta, &delegate);
     EXPECT_FLOAT_EQ(target_opacity, delegate.GetOpacityForAnimation());
 
     // Now at the start of the pause.
     EXPECT_FLOAT_EQ(0.0, sequence.last_progressed_fraction());
     TestLayerAnimationDelegate copy = delegate;
 
     // In the middle of the pause -- nothing should have changed.
-    sequence.Progress(effective_start + delta + delta/2,
+    sequence.Progress(opacity_effective_start + delta + delta/2,
                       &delegate);
     CheckApproximatelyEqual(delegate.GetBoundsForAnimation(),
                             copy.GetBoundsForAnimation());
     CheckApproximatelyEqual(delegate.GetTransformForAnimation(),
                             copy.GetTransformForAnimation());
     EXPECT_FLOAT_EQ(delegate.GetOpacityForAnimation(),
                     copy.GetOpacityForAnimation());
 
-
-    sequence.Progress(effective_start + 2 * delta, &delegate);
+    sequence.Progress(opacity_effective_start + 2 * delta, &delegate);
     CheckApproximatelyEqual(start_transform,
                             delegate.GetTransformForAnimation());
-    sequence.Progress(effective_start + 2 * delta + delta/2, &delegate);
-    CheckApproximatelyEqual(middle_transform,
-                            delegate.GetTransformForAnimation());
-    EXPECT_TRUE(sequence.IsFinished(effective_start + 3 * delta));
-    sequence.Progress(effective_start + 3 * delta, &delegate);
+    EXPECT_FLOAT_EQ(0.0, sequence.last_progressed_fraction());
+    transform_effective_start = opacity_effective_start + 3 * delta;
+    sequence.OnThreadedAnimationStarted(cc::AnimationEvent(
+        cc::AnimationEvent::Started,
+        0,
+        group_id,
+        cc::Animation::Transform,
+        (transform_effective_start - base::TimeTicks()).InSecondsF()));
+    sequence.Progress(transform_effective_start + delta/2, &delegate);
+    EXPECT_FLOAT_EQ(0.5, sequence.last_progressed_fraction());
+    EXPECT_TRUE(sequence.IsFinished(transform_effective_start + delta));
+    sequence.Progress(transform_effective_start + delta, &delegate);
     CheckApproximatelyEqual(target_transform,
                             delegate.GetTransformForAnimation());
   }
 
   EXPECT_TRUE(sequence.properties().size() == 3);
   EXPECT_TRUE(sequence.properties().find(LayerAnimationElement::OPACITY) !=
               sequence.properties().end());
   EXPECT_TRUE(sequence.properties().find(LayerAnimationElement::TRANSFORM) !=
               sequence.properties().end());
   EXPECT_TRUE(sequence.properties().find(LayerAnimationElement::BOUNDS) !=
@@ skipping 72 matching lines @@
     EXPECT_TRUE(!observer.last_ended_sequence());
     sequence.Progress(start_time + delta, &delegate);
     EXPECT_EQ(observer.last_ended_sequence(), &sequence);
     sequence.RemoveObserver(&observer);
   }
 }
 
 } // namespace
 
 } // namespace ui