| Index: Source/core/rendering/RenderLayer.cpp
|
| diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
|
| index 7cedab40fe15ec6c43f6b5f6cebaa3984ef72caa..b12f2c8d21a40141c25dea93c16e4f41d36433f0 100644
|
| --- a/Source/core/rendering/RenderLayer.cpp
|
| +++ b/Source/core/rendering/RenderLayer.cpp
|
| @@ -57,7 +57,6 @@
|
| #include "core/frame/FrameView.h"
|
| #include "core/page/Page.h"
|
| #include "core/frame/Settings.h"
|
| -#include "core/frame/animation/AnimationController.h"
|
| #include "core/page/scrolling/ScrollingCoordinator.h"
|
| #include "core/rendering/ColumnInfo.h"
|
| #include "core/rendering/CompositedLayerMapping.h"
|
| @@ -529,15 +528,6 @@ TransformationMatrix RenderLayer::currentTransform(RenderStyle::ApplyTransformOr
|
| if (!m_transform)
|
| return TransformationMatrix();
|
|
|
| - // FIXME: handle this under web-animations
|
| - if (!RuntimeEnabledFeatures::webAnimationsCSSEnabled() && renderer()->style()->isRunningAcceleratedAnimation()) {
|
| - TransformationMatrix currTransform;
|
| - RefPtr<RenderStyle> style = renderer()->animation().getAnimatedStyleForRenderer(renderer());
|
| - style->applyTransform(currTransform, renderBox()->pixelSnappedBorderBoxRect().size(), applyOrigin);
|
| - makeMatrixRenderable(currTransform, canRender3DTransforms());
|
| - return currTransform;
|
| - }
|
| -
|
| // m_transform includes transform-origin, so we need to recompute the transform here.
|
| if (applyOrigin == RenderStyle::ExcludeTransformOrigin) {
|
| RenderBox* box = renderBox();
|
| @@ -3685,9 +3675,7 @@ inline bool RenderLayer::needsCompositingLayersRebuiltForFilters(const RenderSty
|
| if (!hasOrHadFilters(oldStyle, newStyle))
|
| return false;
|
|
|
| - if (RuntimeEnabledFeatures::webAnimationsCSSEnabled()
|
| - ? hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyWebkitFilter)
|
| - : renderer()->animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyWebkitFilter)) {
|
| + if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() && hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyWebkitFilter)) {
|
|
|
| // When the compositor is performing the filter animation, we shouldn't touch the compositing layers.
|
| // All of the layers above us should have been promoted to compositing layers already.
|
| @@ -3733,9 +3721,7 @@ void RenderLayer::updateFilters(const RenderStyle* oldStyle, const RenderStyle*
|
| updateOrRemoveFilterClients();
|
| // During an accelerated animation, both WebKit and the compositor animate properties.
|
| // However, WebKit shouldn't ask the compositor to update its filters if the compositor is performing the animation.
|
| - if (hasCompositedLayerMapping() && (RuntimeEnabledFeatures::webAnimationsCSSEnabled()
|
| - ? !hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyWebkitFilter)
|
| - : !renderer()->animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyWebkitFilter)))
|
| + if (hasCompositedLayerMapping() && !(RuntimeEnabledFeatures::webAnimationsCSSEnabled() && hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyWebkitFilter)))
|
| compositedLayerMapping()->updateFilters(renderer()->style());
|
| updateOrRemoveFilterEffectRenderer();
|
| }
|
|
|