| Index: third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| index ce8ff42dd345ce2cb5314501db91911493ec7c33..3acfc8ce3bfa8fa4fee2ed9590ac1acdceb736c9 100644
|
| --- a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| @@ -115,7 +115,7 @@ bool hasIncompatibleAnimations(const Element& targetElement, const Animation& an
|
| {
|
| const bool affectsOpacity = effectToAdd.affects(PropertyHandle(CSSPropertyOpacity));
|
| const bool affectsTransform = effectToAdd.isTransformRelatedEffect();
|
| - const bool affectsFilter = effectToAdd.affects(PropertyHandle(CSSPropertyWebkitFilter));
|
| + const bool affectsFilter = effectToAdd.affects(PropertyHandle(CSSPropertyFilter));
|
| const bool affectsBackdropFilter = effectToAdd.affects(PropertyHandle(CSSPropertyBackdropFilter));
|
|
|
| if (!targetElement.hasAnimations())
|
| @@ -131,7 +131,7 @@ bool hasIncompatibleAnimations(const Element& targetElement, const Animation& an
|
|
|
| if ((affectsOpacity && attachedAnimation->affects(targetElement, CSSPropertyOpacity))
|
| || (affectsTransform && isTransformRelatedAnimation(targetElement, attachedAnimation))
|
| - || (affectsFilter && attachedAnimation->affects(targetElement, CSSPropertyWebkitFilter))
|
| + || (affectsFilter && attachedAnimation->affects(targetElement, CSSPropertyFilter))
|
| || (affectsBackdropFilter && attachedAnimation->affects(targetElement, CSSPropertyBackdropFilter)))
|
| return true;
|
| }
|
| @@ -169,7 +169,7 @@ const CSSPropertyID CompositorAnimations::compositableProperties[7] = {
|
| CSSPropertyScale,
|
| CSSPropertyTransform,
|
| CSSPropertyTranslate,
|
| - CSSPropertyWebkitFilter,
|
| + CSSPropertyFilter,
|
| CSSPropertyBackdropFilter
|
| };
|
|
|
| @@ -278,7 +278,7 @@ bool CompositorAnimations::isCandidateForAnimationOnCompositor(const Timing& tim
|
| if (toAnimatableTransform(keyframe->getAnimatableValue().get())->transformOperations().dependsOnBoxSize())
|
| return false;
|
| break;
|
| - case CSSPropertyWebkitFilter:
|
| + case CSSPropertyFilter:
|
| case CSSPropertyBackdropFilter: {
|
| const FilterOperations& operations = toAnimatableFilterOperations(keyframe->getAnimatableValue().get())->operations();
|
| if (operations.hasFilterThatMovesPixels())
|
| @@ -310,7 +310,7 @@ void CompositorAnimations::cancelIncompatibleAnimationsOnCompositor(const Elemen
|
| {
|
| const bool affectsOpacity = effectToAdd.affects(PropertyHandle(CSSPropertyOpacity));
|
| const bool affectsTransform = effectToAdd.isTransformRelatedEffect();
|
| - const bool affectsFilter = effectToAdd.affects(PropertyHandle(CSSPropertyWebkitFilter));
|
| + const bool affectsFilter = effectToAdd.affects(PropertyHandle(CSSPropertyFilter));
|
| const bool affectsBackdropFilter = effectToAdd.affects(PropertyHandle(CSSPropertyBackdropFilter));
|
|
|
| if (!targetElement.hasAnimations())
|
| @@ -326,7 +326,7 @@ void CompositorAnimations::cancelIncompatibleAnimationsOnCompositor(const Elemen
|
|
|
| if ((affectsOpacity && attachedAnimation->affects(targetElement, CSSPropertyOpacity))
|
| || (affectsTransform && isTransformRelatedAnimation(targetElement, attachedAnimation))
|
| - || (affectsFilter && attachedAnimation->affects(targetElement, CSSPropertyWebkitFilter))
|
| + || (affectsFilter && attachedAnimation->affects(targetElement, CSSPropertyFilter))
|
| || (affectsBackdropFilter && attachedAnimation->affects(targetElement, CSSPropertyBackdropFilter)))
|
| attachedAnimation->cancelAnimationOnCompositor();
|
| }
|
| @@ -646,7 +646,7 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
|
| curve = adoptPtr(floatCurve);
|
| break;
|
| }
|
| - case CSSPropertyWebkitFilter:
|
| + case CSSPropertyFilter:
|
| case CSSPropertyBackdropFilter: {
|
| targetProperty = CompositorTargetProperty::FILTER;
|
| CompositorFilterAnimationCurve* filterCurve = CompositorFactory::current().createFilterAnimationCurve();
|
|
|