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

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

Issue 2317903003: Add CSS property priority for CSS animation affecting properties (Closed)
Patch Set: Rebased Created 4 years, 2 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
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 1735 matching lines...) Expand 10 before | Expand all | Expand 10 after
1746 if (cacheCustomPropertiesForApplyAtRules(state, 1746 if (cacheCustomPropertiesForApplyAtRules(state,
1747 matchResult.authorRules())) { 1747 matchResult.authorRules())) {
1748 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRules(), 1748 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRules(),
1749 false, applyInheritedOnly); 1749 false, applyInheritedOnly);
1750 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRules(), 1750 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRules(),
1751 true, applyInheritedOnly); 1751 true, applyInheritedOnly);
1752 CSSVariableResolver::resolveVariableDefinitions(state); 1752 CSSVariableResolver::resolveVariableDefinitions(state);
1753 } 1753 }
1754 } 1754 }
1755 1755
1756 // Apply animation properties.
1757 applyMatchedProperties<AnimationPropertyPriority>(
1758 state, matchResult.allRules(), false, applyInheritedOnly);
Timothy Loh 2016/10/21 05:42:55 Don't we need to call this twice, once for not imp
alancutter (OOO until 2018) 2016/10/24 04:08:27 Oops, yes.
1759
1756 // Now we have all of the matched rules in the appropriate order. Walk the 1760 // Now we have all of the matched rules in the appropriate order. Walk the
1757 // rules and apply high-priority properties first, i.e., those properties that 1761 // rules and apply high-priority properties first, i.e., those properties that
1758 // other properties depend on. The order is (1) high-priority not important, 1762 // other properties depend on. The order is (1) high-priority not important,
1759 // (2) high-priority important, (3) normal not important and (4) normal 1763 // (2) high-priority important, (3) normal not important and (4) normal
1760 // important. 1764 // important.
1761 applyMatchedProperties<HighPropertyPriority>(state, matchResult.allRules(), 1765 applyMatchedProperties<HighPropertyPriority>(state, matchResult.allRules(),
1762 false, applyInheritedOnly); 1766 false, applyInheritedOnly);
1763 for (auto range : ImportantAuthorRanges(matchResult)) 1767 for (auto range : ImportantAuthorRanges(matchResult))
1764 applyMatchedProperties<HighPropertyPriority>(state, range, true, 1768 applyMatchedProperties<HighPropertyPriority>(state, range, true,
1765 applyInheritedOnly); 1769 applyInheritedOnly);
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
1944 visitor->trace(m_siblingRuleSet); 1948 visitor->trace(m_siblingRuleSet);
1945 visitor->trace(m_uncommonAttributeRuleSet); 1949 visitor->trace(m_uncommonAttributeRuleSet);
1946 visitor->trace(m_watchedSelectorsRules); 1950 visitor->trace(m_watchedSelectorsRules);
1947 visitor->trace(m_treeBoundaryCrossingScopes); 1951 visitor->trace(m_treeBoundaryCrossingScopes);
1948 visitor->trace(m_styleSharingLists); 1952 visitor->trace(m_styleSharingLists);
1949 visitor->trace(m_pendingStyleSheets); 1953 visitor->trace(m_pendingStyleSheets);
1950 visitor->trace(m_document); 1954 visitor->trace(m_document);
1951 } 1955 }
1952 1956
1953 } // namespace blink 1957 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698