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

Unified Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Issue 2724313002: Split transitions update storage between custom and standard properties (Closed)
Patch Set: Created 3 years, 10 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/Source/core/animation/css/CSSAnimations.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
index f7e938460cbf8fdbe46f7c75729baf5a952e02ad..6ed6197f42206fba789d02c695d9109d461d81d5 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
@@ -1130,20 +1130,20 @@ bool StyleResolver::applyAnimatedStandardProperties(
const ActiveInterpolationsMap& activeInterpolationsMapForAnimations =
state.animationUpdate().activeInterpolationsForAnimations();
- const ActiveInterpolationsMap& activeInterpolationsMapForTransitions =
- state.animationUpdate().activeInterpolationsForTransitions();
+ const ActiveInterpolationsMap& activeInterpolationsMapForStandardTransitions =
+ state.animationUpdate().activeInterpolationsForStandardTransitions();
// TODO(crbug.com/644148): Apply animations on custom properties.
applyAnimatedProperties<HighPropertyPriority>(
state, activeInterpolationsMapForAnimations);
applyAnimatedProperties<HighPropertyPriority>(
- state, activeInterpolationsMapForTransitions);
+ state, activeInterpolationsMapForStandardTransitions);
updateFont(state);
applyAnimatedProperties<LowPropertyPriority>(
state, activeInterpolationsMapForAnimations);
applyAnimatedProperties<LowPropertyPriority>(
- state, activeInterpolationsMapForTransitions);
+ state, activeInterpolationsMapForStandardTransitions);
// Start loading resources used by animations.
loadPendingResources(state);
« no previous file with comments | « third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698