| Index: Source/core/frame/animation/AnimationController.cpp
|
| diff --git a/Source/core/frame/animation/AnimationController.cpp b/Source/core/frame/animation/AnimationController.cpp
|
| index defa4e5927b8b0e06fc24f0b77c0e7bcfb896438..8521e139a08ee89ddf419b11a46af630f1d36c3d 100644
|
| --- a/Source/core/frame/animation/AnimationController.cpp
|
| +++ b/Source/core/frame/animation/AnimationController.cpp
|
| @@ -265,7 +265,7 @@ bool AnimationControllerPrivate::isRunningAnimationOnRenderer(RenderObject* rend
|
| return animation->isAnimatingProperty(property, false, isRunningNow);
|
| }
|
|
|
| -bool AnimationControllerPrivate::isRunningAcceleratableAnimationOnRenderer(RenderObject *renderer, bool isOpacityAcceleratable) const
|
| +bool AnimationControllerPrivate::isRunningAcceleratableAnimationOnRenderer(RenderObject *renderer) const
|
| {
|
| RefPtr<CompositeAnimation> animation = m_compositeAnimations.get(renderer);
|
| if (!animation)
|
| @@ -273,7 +273,7 @@ bool AnimationControllerPrivate::isRunningAcceleratableAnimationOnRenderer(Rende
|
|
|
| bool acceleratedOnly = false;
|
| bool isRunningNow = true;
|
| - return (isOpacityAcceleratable && animation->isAnimatingProperty(CSSPropertyOpacity, acceleratedOnly, isRunningNow))
|
| + return animation->isAnimatingProperty(CSSPropertyOpacity, acceleratedOnly, isRunningNow)
|
| || animation->isAnimatingProperty(CSSPropertyWebkitTransform, acceleratedOnly, isRunningNow)
|
| || animation->isAnimatingProperty(CSSPropertyWebkitFilter, acceleratedOnly, isRunningNow);
|
| }
|
| @@ -504,9 +504,9 @@ bool AnimationController::isRunningAnimationOnRenderer(RenderObject* renderer, C
|
| return m_data->isRunningAnimationOnRenderer(renderer, property, isRunningNow);
|
| }
|
|
|
| -bool AnimationController::isRunningAcceleratableAnimationOnRenderer(RenderObject* renderer, bool isOpacityAcceleratable) const
|
| +bool AnimationController::isRunningAcceleratableAnimationOnRenderer(RenderObject* renderer) const
|
| {
|
| - return m_data->isRunningAcceleratableAnimationOnRenderer(renderer, isOpacityAcceleratable);
|
| + return m_data->isRunningAcceleratableAnimationOnRenderer(renderer);
|
| }
|
|
|
| bool AnimationController::isRunningAcceleratedAnimationOnRenderer(RenderObject* renderer, CSSPropertyID property, bool isRunningNow) const
|
|
|