Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

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

Issue 1987943002: [wip] unprefix filter Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
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 3a897e005dfeca8953e980e5071772787486aaf1..b963196ccc40ebb1b5be41562651f7c69f6dd952 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();
}
@@ -647,7 +647,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();

Powered by Google App Engine
This is Rietveld 408576698