Index: Source/core/rendering/style/RenderStyle.cpp |
diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp |
index 36a5331430e49dd34a1f25d372a1e3da524d7ead..e23993e4ac77482f06635f5a340d0b1b41b8e401 100644 |
--- a/Source/core/rendering/style/RenderStyle.cpp |
+++ b/Source/core/rendering/style/RenderStyle.cpp |
@@ -1070,7 +1070,7 @@ const AtomicString& RenderStyle::textEmphasisMarkString() const |
void RenderStyle::adjustAnimations() |
{ |
- CSSAnimationDataList* animationList = rareNonInheritedData->m_animations.get(); |
+ StyleAnimationDataList* animationList = rareNonInheritedData->m_animations.get(); |
if (!animationList) |
return; |
@@ -1093,7 +1093,7 @@ void RenderStyle::adjustAnimations() |
void RenderStyle::adjustTransitions() |
{ |
- CSSAnimationDataList* transitionList = rareNonInheritedData->m_transitions.get(); |
+ StyleAnimationDataList* transitionList = rareNonInheritedData->m_transitions.get(); |
if (!transitionList) |
return; |
@@ -1126,26 +1126,26 @@ void RenderStyle::adjustTransitions() |
} |
} |
-CSSAnimationDataList* RenderStyle::accessAnimations() |
+StyleAnimationDataList* RenderStyle::accessAnimations() |
{ |
if (!rareNonInheritedData.access()->m_animations) |
- rareNonInheritedData.access()->m_animations = adoptPtr(new CSSAnimationDataList()); |
+ rareNonInheritedData.access()->m_animations = adoptPtr(new StyleAnimationDataList()); |
return rareNonInheritedData->m_animations.get(); |
} |
-CSSAnimationDataList* RenderStyle::accessTransitions() |
+StyleAnimationDataList* RenderStyle::accessTransitions() |
{ |
if (!rareNonInheritedData.access()->m_transitions) |
- rareNonInheritedData.access()->m_transitions = adoptPtr(new CSSAnimationDataList()); |
+ rareNonInheritedData.access()->m_transitions = adoptPtr(new StyleAnimationDataList()); |
return rareNonInheritedData->m_transitions.get(); |
} |
-const CSSAnimationData* RenderStyle::transitionForProperty(CSSPropertyID property) const |
+const StyleAnimationData* RenderStyle::transitionForProperty(CSSPropertyID property) const |
{ |
if (transitions()) { |
for (size_t i = 0; i < transitions()->size(); ++i) { |
- const CSSAnimationData* p = transitions()->animation(i); |
- if (p->animationMode() == CSSAnimationData::AnimateAll || p->property() == property) { |
+ const StyleAnimationData* p = transitions()->animation(i); |
+ if (p->animationMode() == StyleAnimationData::AnimateAll || p->property() == property) { |
return p; |
} |
} |