| Index: Source/core/rendering/RenderLayerBacking.cpp
|
| diff --git a/Source/core/rendering/RenderLayerBacking.cpp b/Source/core/rendering/RenderLayerBacking.cpp
|
| index eb5fc8120826997def8c0ce38dbc7d051a3017e3..fd6168c77e2173722891066d6b9f03cbfbf30fd3 100644
|
| --- a/Source/core/rendering/RenderLayerBacking.cpp
|
| +++ b/Source/core/rendering/RenderLayerBacking.cpp
|
| @@ -1734,7 +1734,7 @@ void RenderLayerBacking::verifyNotPainting()
|
| }
|
| #endif
|
|
|
| -bool RenderLayerBacking::startAnimation(double timeOffset, const CSSAnimationData* anim, const KeyframeList& keyframes)
|
| +bool RenderLayerBacking::startAnimation(double timeOffset, const StyleAnimationData* anim, const KeyframeList& keyframes)
|
| {
|
| bool hasOpacity = keyframes.containsProperty(CSSPropertyOpacity);
|
| bool hasTransform = renderer()->isBox() && keyframes.containsProperty(CSSPropertyWebkitTransform);
|
| @@ -1805,7 +1805,7 @@ bool RenderLayerBacking::startTransition(double timeOffset, CSSPropertyID proper
|
| ASSERT(property != CSSPropertyInvalid);
|
|
|
| if (property == CSSPropertyOpacity) {
|
| - const CSSAnimationData* opacityAnim = toStyle->transitionForProperty(CSSPropertyOpacity);
|
| + const StyleAnimationData* opacityAnim = toStyle->transitionForProperty(CSSPropertyOpacity);
|
| if (opacityAnim && !opacityAnim->isEmptyOrZeroDuration()) {
|
| KeyframeValueList opacityVector(AnimatedPropertyOpacity);
|
| opacityVector.insert(new FloatAnimationValue(0, compositingOpacity(fromStyle->opacity())));
|
| @@ -1820,7 +1820,7 @@ bool RenderLayerBacking::startTransition(double timeOffset, CSSPropertyID proper
|
| }
|
|
|
| if (property == CSSPropertyWebkitTransform && m_owningLayer->hasTransform()) {
|
| - const CSSAnimationData* transformAnim = toStyle->transitionForProperty(CSSPropertyWebkitTransform);
|
| + const StyleAnimationData* transformAnim = toStyle->transitionForProperty(CSSPropertyWebkitTransform);
|
| if (transformAnim && !transformAnim->isEmptyOrZeroDuration()) {
|
| KeyframeValueList transformVector(AnimatedPropertyWebkitTransform);
|
| transformVector.insert(new TransformAnimationValue(0, &fromStyle->transform()));
|
| @@ -1834,7 +1834,7 @@ bool RenderLayerBacking::startTransition(double timeOffset, CSSPropertyID proper
|
| }
|
|
|
| if (property == CSSPropertyWebkitFilter && m_owningLayer->hasFilter()) {
|
| - const CSSAnimationData* filterAnim = toStyle->transitionForProperty(CSSPropertyWebkitFilter);
|
| + const StyleAnimationData* filterAnim = toStyle->transitionForProperty(CSSPropertyWebkitFilter);
|
| if (filterAnim && !filterAnim->isEmptyOrZeroDuration()) {
|
| KeyframeValueList filterVector(AnimatedPropertyWebkitFilter);
|
| filterVector.insert(new FilterAnimationValue(0, &fromStyle->filter()));
|
|
|