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

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

Issue 1312983003: Apply CSS Animations on color properties to visited and unvisited link computed styles (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix compile 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/animations/visited-link-color-animation-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index 1a1bcdf4213ce5ebbae6e13e27d50aaf4f0b19df..d0ccf6d62dce95b1c41fe3ae86dfd0de0e6a5549 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -934,6 +934,11 @@ bool StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Ele
if (state.animationUpdate().isEmpty())
return false;
+ if (state.style()->insideLink() != NotInsideLink) {
+ ASSERT(state.applyPropertyToRegularStyle());
+ state.setApplyPropertyToVisitedLinkStyle(true);
+ }
+
const ActiveInterpolationMap& activeInterpolationsForAnimations = state.animationUpdate().activeInterpolationsForAnimations();
const ActiveInterpolationMap& activeInterpolationsForTransitions = state.animationUpdate().activeInterpolationsForTransitions();
applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsForAnimations);
@@ -949,6 +954,8 @@ bool StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Ele
ASSERT(!state.fontBuilder().fontDirty());
+ state.setApplyPropertyToVisitedLinkStyle(false);
+
return true;
}
« no previous file with comments | « LayoutTests/animations/visited-link-color-animation-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698