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