Web Animations: Update naming to reflect spec changes

Source/core/animation/KeyframeEffectModelTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 94 matching lines @@
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 0.6, duration, values);
     ASSERT_EQ(1UL, values->size());
     expectProperty(CSSPropertyLeft, values->at(0));
     expectDoubleValue(5.0, values->at(0));
 }
 
 TEST(AnimationKeyframeEffectModel, CompositeReplaceNonInterpolable)
 {
     AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(unknownAnimatableValue(3.0), unknownAnimatableValue(5.0));
-    keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
-    keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
+    keyframes[0]->setComposite(EffectModel::CompositeReplace);
+    keyframes[1]->setComposite(EffectModel::CompositeReplace);
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 0.6, duration, values);
     expectDoubleValue(5.0, values->at(0));
 }
 
 TEST(AnimationKeyframeEffectModel, CompositeReplace)
 {
     AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
-    keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
-    keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
+    keyframes[0]->setComposite(EffectModel::CompositeReplace);
+    keyframes[1]->setComposite(EffectModel::CompositeReplace);
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 0.6, duration, values);
     expectDoubleValue(3.0 * 0.4 + 5.0 * 0.6, values->at(0));
 }
 
 // FIXME: Re-enable this test once compositing of CompositeAdd is supported.
 TEST(AnimationKeyframeEffectModel, DISABLED_CompositeAdd)
 {
     AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
-    keyframes[0]->setComposite(AnimationEffect::CompositeAdd);
-    keyframes[1]->setComposite(AnimationEffect::CompositeAdd);
+    keyframes[0]->setComposite(EffectModel::CompositeAdd);
+    keyframes[1]->setComposite(EffectModel::CompositeAdd);
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 0.6, duration, values);
     expectDoubleValue((7.0 + 3.0) * 0.4 + (7.0 + 5.0) * 0.6, values->at(0));
 }
 
 TEST(AnimationKeyframeEffectModel, CompositeEaseIn)
 {
     AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
-    keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
+    keyframes[0]->setComposite(EffectModel::CompositeReplace);
     keyframes[0]->setEasing(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseIn));
-    keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
+    keyframes[1]->setComposite(EffectModel::CompositeReplace);
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 0.6, duration, values);
     expectDoubleValue(3.8579516, values->at(0));
     effect->sample(0, 0.6, duration * 100, values);
     expectDoubleValue(3.8582394, values->at(0));
 }
 
 TEST(AnimationKeyframeEffectModel, CompositeCubicBezier)
 {
     AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
-    keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
+    keyframes[0]->setComposite(EffectModel::CompositeReplace);
     keyframes[0]->setEasing(CubicBezierTimingFunction::create(0.42, 0, 0.58, 1));
-    keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
+    keyframes[1]->setComposite(EffectModel::CompositeReplace);
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 0.6, duration, values);
     expectDoubleValue(4.3363357, values->at(0));
     effect->sample(0, 0.6, duration * 1000, values);
     expectDoubleValue(4.3362322, values->at(0));
 }
 
 TEST(AnimationKeyframeEffectModel, ExtrapolateReplaceNonInterpolable)
 {
     AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(unknownAnimatableValue(3.0), unknownAnimatableValue(5.0));
-    keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
-    keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
+    keyframes[0]->setComposite(EffectModel::CompositeReplace);
+    keyframes[1]->setComposite(EffectModel::CompositeReplace);
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 1.6, duration, values);
     expectDoubleValue(5.0, values->at(0));
 }
 
 TEST(AnimationKeyframeEffectModel, ExtrapolateReplace)
 {
     AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
-    keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
-    keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
+    keyframes[0]->setComposite(EffectModel::CompositeReplace);
+    keyframes[1]->setComposite(EffectModel::CompositeReplace);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 1.6, duration, values);
     expectDoubleValue(3.0 * -0.6 + 5.0 * 1.6, values->at(0));
 }
 
 // FIXME: Re-enable this test once compositing of CompositeAdd is supported.
 TEST(AnimationKeyframeEffectModel, DISABLED_ExtrapolateAdd)
 {
     AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
-    keyframes[0]->setComposite(AnimationEffect::CompositeAdd);
-    keyframes[1]->setComposite(AnimationEffect::CompositeAdd);
+    keyframes[0]->setComposite(EffectModel::CompositeAdd);
+    keyframes[1]->setComposite(EffectModel::CompositeAdd);
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 1.6, duration, values);
     expectDoubleValue((7.0 + 3.0) * -0.6 + (7.0 + 5.0) * 1.6, values->at(0));
 }
 
 TEST(AnimationKeyframeEffectModel, ZeroKeyframes)
 {
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector());
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
@@ skipping 146 matching lines @@
 // FIXME: Re-enable this test once compositing of CompositeAdd is supported.
 TEST(AnimationKeyframeEffectModel, DISABLED_PerKeyframeComposite)
 {
     AnimatableValueKeyframeVector keyframes(2);
     keyframes[0] = AnimatableValueKeyframe::create();
     keyframes[0]->setOffset(0.0);
     keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(3.0).get());
     keyframes[1] = AnimatableValueKeyframe::create();
     keyframes[1]->setOffset(1.0);
     keyframes[1]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(5.0).get());
-    keyframes[1]->setComposite(AnimationEffect::CompositeAdd);
+    keyframes[1]->setComposite(EffectModel::CompositeAdd);
 
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 0.6, duration, values);
     expectDoubleValue(3.0 * 0.4 + (7.0 + 5.0) * 0.6, values->at(0));
 }
 
 TEST(AnimationKeyframeEffectModel, MultipleProperties)
 {
     AnimatableValueKeyframeVector keyframes(2);
@@ skipping 15 matching lines @@
     expectDoubleValue(5.0, leftValue);
     Interpolation* rightValue = findValue(*values.get(), CSSPropertyRight);
     ASSERT_TRUE(rightValue);
     expectDoubleValue(6.0, rightValue);
 }
 
 // FIXME: Re-enable this test once compositing of CompositeAdd is supported.
 TEST(AnimationKeyframeEffectModel, DISABLED_RecompositeCompositableValue)
 {
     AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
-    keyframes[0]->setComposite(AnimationEffect::CompositeAdd);
-    keyframes[1]->setComposite(AnimationEffect::CompositeAdd);
+    keyframes[0]->setComposite(EffectModel::CompositeAdd);
+    keyframes[1]->setComposite(EffectModel::CompositeAdd);
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 0.6, duration, values);
     expectDoubleValue((7.0 + 3.0) * 0.4 + (7.0 + 5.0) * 0.6, values->at(0));
     expectDoubleValue((9.0 + 3.0) * 0.4 + (9.0 + 5.0) * 0.6, values->at(0));
 }
 
 TEST(AnimationKeyframeEffectModel, MultipleIterations)
 {
     AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(1.0), pixelAnimatableValue(3.0));
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 0.5, duration, values);
     expectDoubleValue(2.0, values->at(0));
     effect->sample(1, 0.5, duration, values);
     expectDoubleValue(2.0, values->at(0));
     effect->sample(2, 0.5, duration, values);
     expectDoubleValue(2.0, values->at(0));
 }
 
 // FIXME: Re-enable this test once compositing of CompositeAdd is supported.
 TEST(AnimationKeyframeEffectModel, DISABLED_DependsOnUnderlyingValue)
 {
     AnimatableValueKeyframeVector keyframes(3);
     keyframes[0] = AnimatableValueKeyframe::create();
     keyframes[0]->setOffset(0.0);
     keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).get());
-    keyframes[0]->setComposite(AnimationEffect::CompositeAdd);
+    keyframes[0]->setComposite(EffectModel::CompositeAdd);
     keyframes[1] = AnimatableValueKeyframe::create();
     keyframes[1]->setOffset(0.5);
     keyframes[1]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).get());
     keyframes[2] = AnimatableValueKeyframe::create();
     keyframes[2]->setOffset(1.0);
     keyframes[2]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).get());
 
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
     effect->sample(0, 0, duration, values);
@@ skipping 29 matching lines @@
     EXPECT_DOUBLE_EQ(0.0, propertySpecificKeyframes[0]->offset());
     EXPECT_DOUBLE_EQ(0.5, propertySpecificKeyframes[1]->offset());
     EXPECT_DOUBLE_EQ(1.0, propertySpecificKeyframes[2]->offset());
 }
 
 TEST(AnimationKeyframeEffectModel, ToKeyframeEffectModel)
 {
     AnimatableValueKeyframeVector keyframes(0);
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
 
-    AnimationEffect* baseEffect = effect.get();
+    EffectModel* baseEffect = effect.get();
     EXPECT_TRUE(toAnimatableValueKeyframeEffectModel(baseEffect));
 }
 
 } // namespace
 
 namespace blink {
 
 class KeyframeEffectModelTest : public ::testing::Test {
 public:
     static KeyframeVector normalizedKeyframes(const KeyframeVector& keyframes)
@@ skipping 72 matching lines @@
     EXPECT_DOUBLE_EQ(0.6, result[5]->offset());
     EXPECT_DOUBLE_EQ(0.7, result[6]->offset());
     EXPECT_DOUBLE_EQ(0.8, result[7]->offset());
     EXPECT_DOUBLE_EQ(0.85, result[8]->offset());
     EXPECT_DOUBLE_EQ(0.9, result[9]->offset());
     EXPECT_DOUBLE_EQ(0.95, result[10]->offset());
     EXPECT_DOUBLE_EQ(1.0, result[11]->offset());
 }
 
 } // namespace blink