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