third_party/WebKit/Source/core/animation/CompositorAnimations.cpp - Issue 2065593002: Unprefix the CSS 'filter' property

Unified Diff: third_party/WebKit/Source/core/animation/CompositorAnimations.cpp

Issue 2065593002: Unprefix the CSS 'filter' property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove disabler. Try different DCHECK expressions. Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolationTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a4bd613b782f56c9f019621cc9494ea10ec729f4..007c1cc384af9deb5b2b7b2d969f4e96f23c5db6 100644

--- a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp

+++ b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp

@@ -114,7 +114,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())

@@ -130,7 +130,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;

}

@@ -155,7 +155,7 @@ const CSSPropertyID CompositorAnimations::compositableProperties[7] = {

CSSPropertyScale,

CSSPropertyTransform,

CSSPropertyTranslate,

- CSSPropertyWebkitFilter,

+ CSSPropertyFilter,

CSSPropertyBackdropFilter

};

@@ -264,7 +264,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())

@@ -296,7 +296,7 @@ void CompositorAnimations::cancelIncompatibleAnimationsOnCompositor(const Elemen

{