| Index: Source/core/animation/ActiveAnimations.cpp
|
| diff --git a/Source/core/animation/ActiveAnimations.cpp b/Source/core/animation/ActiveAnimations.cpp
|
| index 40294fb4643e6d09f4a42b849234f90563e11701..037e3df256d1d59999729c1eee2b80096137a766 100644
|
| --- a/Source/core/animation/ActiveAnimations.cpp
|
| +++ b/Source/core/animation/ActiveAnimations.cpp
|
| @@ -46,10 +46,10 @@ bool shouldCompositeForActiveAnimations(const RenderObject& renderer, bool rende
|
| const Element* element = toElement(renderer.node());
|
| if (const ActiveAnimations* activeAnimations = element->activeAnimations()) {
|
| // FIXME: remove compositing mode check once compositing is forced on all platforms
|
| - bool shouldCompositeForActiveAnimation = (activeAnimations->hasActiveAnimations(CSSPropertyOpacity) && renderViewInCompositingMode)
|
| + if ((renderViewInCompositingMode && activeAnimations->hasActiveAnimations(CSSPropertyOpacity))
|
| || activeAnimations->hasActiveAnimations(CSSPropertyWebkitTransform)
|
| - || activeAnimations->hasActiveAnimations(CSSPropertyWebkitFilter);
|
| - return shouldCompositeForActiveAnimation || activeAnimations->cssAnimations().shouldCompositeForPendingAnimations(renderViewInCompositingMode);
|
| + || activeAnimations->hasActiveAnimations(CSSPropertyWebkitFilter))
|
| + return true;
|
| }
|
|
|
| return false;
|
|
|