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

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

Issue 2279133002: Remove CSSVariables RuntimeEnabledFeatures flag (status=stable) (Closed)
Patch Set: Created 4 years, 3 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. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 1541 matching lines...) Expand 10 before | Expand all | Expand 10 after
1552 state.style()->setInsideLink(linkStatus); 1552 state.style()->setInsideLink(linkStatus);
1553 1553
1554 updateFont(state); 1554 updateFont(state);
1555 1555
1556 return; 1556 return;
1557 } 1557 }
1558 applyInheritedOnly = true; 1558 applyInheritedOnly = true;
1559 } 1559 }
1560 1560
1561 // TODO(leviw): We need the proper bit for tracking whether we need to do th is work. 1561 // TODO(leviw): We need the proper bit for tracking whether we need to do th is work.
1562 if (RuntimeEnabledFeatures::cssVariablesEnabled()) { 1562 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRules(), f alse, applyInheritedOnly);
1563 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRules( ), false, applyInheritedOnly); 1563 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRules(), t rue, applyInheritedOnly);
1564 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRules( ), true, applyInheritedOnly); 1564 // TODO(leviw): stop recalculating every time
1565 // TODO(leviw): stop recalculating every time 1565 CSSVariableResolver::resolveVariableDefinitions(state.style()->variables());
1566 CSSVariableResolver::resolveVariableDefinitions(state.style()->variables ());
1567 }
1568 1566
1569 if (RuntimeEnabledFeatures::cssApplyAtRulesEnabled()) { 1567 if (RuntimeEnabledFeatures::cssApplyAtRulesEnabled()) {
1570 if (cacheCustomPropertiesForApplyAtRules(state, matchResult.authorRules( ))) { 1568 if (cacheCustomPropertiesForApplyAtRules(state, matchResult.authorRules( ))) {
1571 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRu les(), false, applyInheritedOnly); 1569 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRu les(), false, applyInheritedOnly);
1572 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRu les(), true, applyInheritedOnly); 1570 applyMatchedProperties<ResolveVariables>(state, matchResult.authorRu les(), true, applyInheritedOnly);
1573 CSSVariableResolver::resolveVariableDefinitions(state.style()->varia bles()); 1571 CSSVariableResolver::resolveVariableDefinitions(state.style()->varia bles());
1574 } 1572 }
1575 } 1573 }
1576 1574
1577 // Now we have all of the matched rules in the appropriate order. Walk the r ules and apply 1575 // Now we have all of the matched rules in the appropriate order. Walk the r ules and apply
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
1746 visitor->trace(m_siblingRuleSet); 1744 visitor->trace(m_siblingRuleSet);
1747 visitor->trace(m_uncommonAttributeRuleSet); 1745 visitor->trace(m_uncommonAttributeRuleSet);
1748 visitor->trace(m_watchedSelectorsRules); 1746 visitor->trace(m_watchedSelectorsRules);
1749 visitor->trace(m_treeBoundaryCrossingScopes); 1747 visitor->trace(m_treeBoundaryCrossingScopes);
1750 visitor->trace(m_styleSharingLists); 1748 visitor->trace(m_styleSharingLists);
1751 visitor->trace(m_pendingStyleSheets); 1749 visitor->trace(m_pendingStyleSheets);
1752 visitor->trace(m_document); 1750 visitor->trace(m_document);
1753 } 1751 }
1754 1752
1755 } // namespace blink 1753 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698