| 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 31e504c25259d8ab80bfa625411bdef0c88e9acf..e397eb662bcd3b722a9cfd0fb6d0036ef903e158 100644
|
| --- a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| @@ -113,7 +113,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())
|
| @@ -129,7 +129,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;
|
| }
|
| @@ -154,7 +154,7 @@ const CSSPropertyID CompositorAnimations::compositableProperties[7] = {
|
| CSSPropertyScale,
|
| CSSPropertyTransform,
|
| CSSPropertyTranslate,
|
| - CSSPropertyWebkitFilter,
|
| + CSSPropertyFilter,
|
| CSSPropertyBackdropFilter
|
| };
|
|
|
| @@ -263,7 +263,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())
|
| @@ -295,7 +295,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())
|
| @@ -311,7 +311,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();
|
| }
|
| @@ -586,7 +586,7 @@ void CompositorAnimations::getAnimationOnCompositor(const Timing& timing, int gr
|
| curve = std::move(floatCurve);
|
| break;
|
| }
|
| - case CSSPropertyWebkitFilter:
|
| + case CSSPropertyFilter:
|
| case CSSPropertyBackdropFilter: {
|
| targetProperty = CompositorTargetProperty::FILTER;
|
| OwnPtr<CompositorFilterAnimationCurve> filterCurve = CompositorFilterAnimationCurve::create();
|
|
|