| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 3563a1848b3778e7ecf5b8063621ef5f2d64caae..51c8ae079b3960e56cc82476d4118ece083dc861 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -33,7 +33,7 @@
|
| #include "core/platform/LengthBox.h"
|
| #include "core/platform/LengthSize.h"
|
| #include "core/platform/ThemeTypes.h"
|
| -#include "core/platform/animation/CSSAnimationDataList.h"
|
| +#include "core/platform/animation/StyleAnimationDataList.h"
|
| #include "core/platform/graphics/Color.h"
|
| #include "core/platform/graphics/ColorSpace.h"
|
| #include "core/platform/graphics/FontBaseline.h"
|
| @@ -877,17 +877,17 @@ public:
|
|
|
| // Apple-specific property getter methods
|
| EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(inherited_flags._pointerEvents); }
|
| - const CSSAnimationDataList* animations() const { return rareNonInheritedData->m_animations.get(); }
|
| - const CSSAnimationDataList* transitions() const { return rareNonInheritedData->m_transitions.get(); }
|
| + const StyleAnimationDataList* animations() const { return rareNonInheritedData->m_animations.get(); }
|
| + const StyleAnimationDataList* transitions() const { return rareNonInheritedData->m_transitions.get(); }
|
|
|
| - CSSAnimationDataList* accessAnimations();
|
| - CSSAnimationDataList* accessTransitions();
|
| + StyleAnimationDataList* accessAnimations();
|
| + StyleAnimationDataList* accessTransitions();
|
|
|
| bool hasAnimations() const { return rareNonInheritedData->m_animations && rareNonInheritedData->m_animations->size() > 0; }
|
| bool hasTransitions() const { return rareNonInheritedData->m_transitions && rareNonInheritedData->m_transitions->size() > 0; }
|
|
|
| // return the first found Animation (including 'all' transitions)
|
| - const CSSAnimationData* transitionForProperty(CSSPropertyID) const;
|
| + const StyleAnimationData* transitionForProperty(CSSPropertyID) const;
|
|
|
| ETransformStyle3D transformStyle3D() const { return static_cast<ETransformStyle3D>(rareNonInheritedData->m_transformStyle3D); }
|
| bool preserves3D() const { return rareNonInheritedData->m_transformStyle3D == TransformStyle3DPreserve3D; }
|
| @@ -1323,8 +1323,8 @@ public:
|
| rareNonInheritedData.access()->m_transitions.clear();
|
| }
|
|
|
| - void inheritAnimations(const CSSAnimationDataList* parent) { rareNonInheritedData.access()->m_animations = parent ? adoptPtr(new CSSAnimationDataList(*parent)) : nullptr; }
|
| - void inheritTransitions(const CSSAnimationDataList* parent) { rareNonInheritedData.access()->m_transitions = parent ? adoptPtr(new CSSAnimationDataList(*parent)) : nullptr; }
|
| + void inheritAnimations(const StyleAnimationDataList* parent) { rareNonInheritedData.access()->m_animations = parent ? adoptPtr(new StyleAnimationDataList(*parent)) : nullptr; }
|
| + void inheritTransitions(const StyleAnimationDataList* parent) { rareNonInheritedData.access()->m_transitions = parent ? adoptPtr(new StyleAnimationDataList(*parent)) : nullptr; }
|
| void adjustAnimations();
|
| void adjustTransitions();
|
|
|
|
|