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

Side by Side 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, 9 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 if (state.animationUpdate().isEmpty()) 1123 if (state.animationUpdate().isEmpty())
1124 return false; 1124 return false;
1125 1125
1126 if (state.style()->insideLink() != EInsideLink::kNotInsideLink) { 1126 if (state.style()->insideLink() != EInsideLink::kNotInsideLink) {
1127 DCHECK(state.applyPropertyToRegularStyle()); 1127 DCHECK(state.applyPropertyToRegularStyle());
1128 state.setApplyPropertyToVisitedLinkStyle(true); 1128 state.setApplyPropertyToVisitedLinkStyle(true);
1129 } 1129 }
1130 1130
1131 const ActiveInterpolationsMap& activeInterpolationsMapForAnimations = 1131 const ActiveInterpolationsMap& activeInterpolationsMapForAnimations =
1132 state.animationUpdate().activeInterpolationsForAnimations(); 1132 state.animationUpdate().activeInterpolationsForAnimations();
1133 const ActiveInterpolationsMap& activeInterpolationsMapForTransitions = 1133 const ActiveInterpolationsMap& activeInterpolationsMapForStandardTransitions =
1134 state.animationUpdate().activeInterpolationsForTransitions(); 1134 state.animationUpdate().activeInterpolationsForStandardTransitions();
1135 // TODO(crbug.com/644148): Apply animations on custom properties. 1135 // TODO(crbug.com/644148): Apply animations on custom properties.
1136 applyAnimatedProperties<HighPropertyPriority>( 1136 applyAnimatedProperties<HighPropertyPriority>(
1137 state, activeInterpolationsMapForAnimations); 1137 state, activeInterpolationsMapForAnimations);
1138 applyAnimatedProperties<HighPropertyPriority>( 1138 applyAnimatedProperties<HighPropertyPriority>(
1139 state, activeInterpolationsMapForTransitions); 1139 state, activeInterpolationsMapForStandardTransitions);
1140 1140
1141 updateFont(state); 1141 updateFont(state);
1142 1142
1143 applyAnimatedProperties<LowPropertyPriority>( 1143 applyAnimatedProperties<LowPropertyPriority>(
1144 state, activeInterpolationsMapForAnimations); 1144 state, activeInterpolationsMapForAnimations);
1145 applyAnimatedProperties<LowPropertyPriority>( 1145 applyAnimatedProperties<LowPropertyPriority>(
1146 state, activeInterpolationsMapForTransitions); 1146 state, activeInterpolationsMapForStandardTransitions);
1147 1147
1148 // Start loading resources used by animations. 1148 // Start loading resources used by animations.
1149 loadPendingResources(state); 1149 loadPendingResources(state);
1150 1150
1151 DCHECK(!state.fontBuilder().fontDirty()); 1151 DCHECK(!state.fontBuilder().fontDirty());
1152 1152
1153 state.setApplyPropertyToVisitedLinkStyle(false); 1153 state.setApplyPropertyToVisitedLinkStyle(false);
1154 1154
1155 return true; 1155 return true;
1156 } 1156 }
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
1945 1945
1946 DEFINE_TRACE(StyleResolver) { 1946 DEFINE_TRACE(StyleResolver) {
1947 visitor->trace(m_matchedPropertiesCache); 1947 visitor->trace(m_matchedPropertiesCache);
1948 visitor->trace(m_selectorFilter); 1948 visitor->trace(m_selectorFilter);
1949 visitor->trace(m_styleSharingLists); 1949 visitor->trace(m_styleSharingLists);
1950 visitor->trace(m_document); 1950 visitor->trace(m_document);
1951 visitor->trace(m_tracker); 1951 visitor->trace(m_tracker);
1952 } 1952 }
1953 1953
1954 } // namespace blink 1954 } // namespace blink
OLDNEW
« 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