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

Unified Diff: Source/core/animation/css/CSSAnimations.cpp

Issue 1319083003: Ignore filter property in CSS Animations (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: -\n Created 5 years, 4 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 | « LayoutTests/virtual/threaded/animations/composited-filter-webkit-filter.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/css/CSSAnimations.cpp
diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
index 6621b91079748d1c22fdcf129ff4eef4a1267b70..f5c34386759549dd6410983ddce389ba3a4c98a1 100644
--- a/Source/core/animation/css/CSSAnimations.cpp
+++ b/Source/core/animation/css/CSSAnimations.cpp
@@ -100,6 +100,11 @@ static PassRefPtrWillBeRawPtr<StringKeyframeEffectModel> createKeyframeEffectMod
timingFunction = CSSTimingData::initialTimingFunction();
}
keyframe->setEasing(timingFunction.release());
+ } else if (property == CSSPropertyFilter) {
+ // TODO(alancutter): We will not support animating filter until -webkit-filter is an alias for it.
+ // This is to prevent animations on both -webkit-filter and filter from being run on the main thread when
+ // they would otherwise run on the compositor.
+ continue;
} else if (CSSAnimations::isAnimatableProperty(property)) {
keyframe->setPropertyValue(property, properties.propertyAt(j).value());
}
« no previous file with comments | « LayoutTests/virtual/threaded/animations/composited-filter-webkit-filter.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698