Rename Animation -> PrimitiveAnimation

Source/core/css/CSSToStyleMap.cpp

Index: Source/core/css/CSSToStyleMap.cpp
diff --git a/Source/core/css/CSSToStyleMap.cpp b/Source/core/css/CSSToStyleMap.cpp
index 721fd8e901b5ebbf1cf6cd749fa8f53f1cfba49b..b80bec5dc464673f1ec67dccf52ea11fbf7f5497 100644
--- a/Source/core/css/CSSToStyleMap.cpp
+++ b/Source/core/css/CSSToStyleMap.cpp
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "CSSToStyleMap.h"
 
-#include "Animation.h"
+#include "PrimitiveAnimation.h"
 #include "CSSBorderImageSliceValue.h"
 #include "CSSPrimitiveValue.h"
 #include "CSSPrimitiveValueMappings.h"
@@ -299,10 +299,10 @@ void CSSToStyleMap::mapFillYPosition(CSSPropertyID propertyID, FillLayer* layer,
         layer->setBackgroundYOrigin(*(pair->first()));
 }
 
-void CSSToStyleMap::mapAnimationDelay(Animation* animation, CSSValue* value)
+void CSSToStyleMap::mapAnimationDelay(PrimitiveAnimation* animation, CSSValue* value)
 {
     if (value->isInitialValue()) {
-        animation->setDelay(Animation::initialAnimationDelay());
+        animation->setDelay(PrimitiveAnimation::initialAnimationDelay());
         return;
     }
 
@@ -313,10 +313,10 @@ void CSSToStyleMap::mapAnimationDelay(Animation* animation, CSSValue* value)
     animation->setDelay(primitiveValue->computeTime<double, CSSPrimitiveValue::Seconds>());
 }
 
-void CSSToStyleMap::mapAnimationDirection(Animation* layer, CSSValue* value)
+void CSSToStyleMap::mapAnimationDirection(PrimitiveAnimation* layer, CSSValue* value)
 {
     if (value->isInitialValue()) {
-        layer->setDirection(Animation::initialAnimationDirection());
+        layer->setDirection(PrimitiveAnimation::initialAnimationDirection());
         return;
     }
 
@@ -326,24 +326,24 @@ void CSSToStyleMap::mapAnimationDirection(Animation* layer, CSSValue* value)
     CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
     switch (primitiveValue->getIdent()) {
     case CSSValueNormal:
-        layer->setDirection(Animation::AnimationDirectionNormal);
+        layer->setDirection(PrimitiveAnimation::AnimationDirectionNormal);
         break;
     case CSSValueAlternate:
-        layer->setDirection(Animation::AnimationDirectionAlternate);
+        layer->setDirection(PrimitiveAnimation::AnimationDirectionAlternate);
         break;
     case CSSValueReverse:
-        layer->setDirection(Animation::AnimationDirectionReverse);
+        layer->setDirection(PrimitiveAnimation::AnimationDirectionReverse);
         break;
     case CSSValueAlternateReverse:
-        layer->setDirection(Animation::AnimationDirectionAlternateReverse);
+        layer->setDirection(PrimitiveAnimation::AnimationDirectionAlternateReverse);
         break;
     }
 }
 
-void CSSToStyleMap::mapAnimationDuration(Animation* animation, CSSValue* value)
+void CSSToStyleMap::mapAnimationDuration(PrimitiveAnimation* animation, CSSValue* value)
 {
     if (value->isInitialValue()) {
-        animation->setDuration(Animation::initialAnimationDuration());
+        animation->setDuration(PrimitiveAnimation::initialAnimationDuration());
         return;
     }
 
@@ -354,10 +354,10 @@ void CSSToStyleMap::mapAnimationDuration(Animation* animation, CSSValue* value)
     animation->setDuration(primitiveValue->computeTime<double, CSSPrimitiveValue::Seconds>());
 }
 
-void CSSToStyleMap::mapAnimationFillMode(Animation* layer, CSSValue* value)
+void CSSToStyleMap::mapAnimationFillMode(PrimitiveAnimation* layer, CSSValue* value)
 {
     if (value->isInitialValue()) {
-        layer->setFillMode(Animation::initialAnimationFillMode());
+        layer->setFillMode(PrimitiveAnimation::initialAnimationFillMode());
         return;
     }
 
@@ -381,10 +381,10 @@ void CSSToStyleMap::mapAnimationFillMode(Animation* layer, CSSValue* value)
     }
 }
 
-void CSSToStyleMap::mapAnimationIterationCount(Animation* animation, CSSValue* value)
+void CSSToStyleMap::mapAnimationIterationCount(PrimitiveAnimation* animation, CSSValue* value)
 {
     if (value->isInitialValue()) {
-        animation->setIterationCount(Animation::initialAnimationIterationCount());
+        animation->setIterationCount(PrimitiveAnimation::initialAnimationIterationCount());
         return;
     }
 
@@ -393,15 +393,15 @@ void CSSToStyleMap::mapAnimationIterationCount(Animation* animation, CSSValue* v
 
     CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
     if (primitiveValue->getIdent() == CSSValueInfinite)
-        animation->setIterationCount(Animation::IterationCountInfinite);
+        animation->setIterationCount(PrimitiveAnimation::IterationCountInfinite);
     else
         animation->setIterationCount(primitiveValue->getFloatValue());
 }
 
-void CSSToStyleMap::mapAnimationName(Animation* layer, CSSValue* value)
+void CSSToStyleMap::mapAnimationName(PrimitiveAnimation* layer, CSSValue* value)
 {
     if (value->isInitialValue()) {
-        layer->setName(Animation::initialAnimationName());
+        layer->setName(PrimitiveAnimation::initialAnimationName());
         return;
     }
 
@@ -415,10 +415,10 @@ void CSSToStyleMap::mapAnimationName(Animation* layer, CSSValue* value)
         layer->setName(primitiveValue->getStringValue());
 }
 
-void CSSToStyleMap::mapAnimationPlayState(Animation* layer, CSSValue* value)
+void CSSToStyleMap::mapAnimationPlayState(PrimitiveAnimation* layer, CSSValue* value)
 {
     if (value->isInitialValue()) {
-        layer->setPlayState(Animation::initialAnimationPlayState());
+        layer->setPlayState(PrimitiveAnimation::initialAnimationPlayState());
         return;
     }
 
@@ -430,10 +430,10 @@ void CSSToStyleMap::mapAnimationPlayState(Animation* layer, CSSValue* value)
     layer->setPlayState(playState);
 }
 
-void CSSToStyleMap::mapAnimationProperty(Animation* animation, CSSValue* value)
+void CSSToStyleMap::mapAnimationProperty(PrimitiveAnimation* animation, CSSValue* value)
 {
     if (value->isInitialValue()) {
-        animation->setAnimationMode(Animation::AnimateAll);
+        animation->setAnimationMode(PrimitiveAnimation::AnimateAll);
         animation->setProperty(CSSPropertyInvalid);
         return;
     }
@@ -443,21 +443,21 @@ void CSSToStyleMap::mapAnimationProperty(Animation* animation, CSSValue* value)
 
     CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
     if (primitiveValue->getIdent() == CSSValueAll) {
-        animation->setAnimationMode(Animation::AnimateAll);
+        animation->setAnimationMode(PrimitiveAnimation::AnimateAll);
         animation->setProperty(CSSPropertyInvalid);
     } else if (primitiveValue->getIdent() == CSSValueNone) {
-        animation->setAnimationMode(Animation::AnimateNone);
+        animation->setAnimationMode(PrimitiveAnimation::AnimateNone);
         animation->setProperty(CSSPropertyInvalid);
     } else {
-        animation->setAnimationMode(Animation::AnimateSingleProperty);
+        animation->setAnimationMode(PrimitiveAnimation::AnimateSingleProperty);
         animation->setProperty(static_cast<CSSPropertyID>(primitiveValue->getIdent()));
     }
 }
 
-void CSSToStyleMap::mapAnimationTimingFunction(Animation* animation, CSSValue* value)
+void CSSToStyleMap::mapAnimationTimingFunction(PrimitiveAnimation* animation, CSSValue* value)
 {
     if (value->isInitialValue()) {
-        animation->setTimingFunction(Animation::initialAnimationTimingFunction());
+        animation->setTimingFunction(PrimitiveAnimation::initialAnimationTimingFunction());
         return;
     }