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

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

Issue 450103005: Add inherited flag to CSSProperties.in (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 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 1315 matching lines...) Expand 10 before | Expand all | Expand 10 after
1326 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand 1326 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand
1327 // We skip applyProperty when a given property is unicode-bidi or 1327 // We skip applyProperty when a given property is unicode-bidi or
1328 // direction. 1328 // direction.
1329 if (!CSSProperty::isAffectedByAllProperty(propertyId)) 1329 if (!CSSProperty::isAffectedByAllProperty(propertyId))
1330 continue; 1330 continue;
1331 1331
1332 CSSValue* value; 1332 CSSValue* value;
1333 if (!isUnsetValue) { 1333 if (!isUnsetValue) {
1334 value = allValue; 1334 value = allValue;
1335 } else { 1335 } else {
1336 if (CSSProperty::isInheritedProperty(propertyId)) 1336 if (CSSPropertyMetadata::isInheritedProperty(propertyId))
1337 value = cssValuePool().createInheritedValue().get(); 1337 value = cssValuePool().createInheritedValue().get();
1338 else 1338 else
1339 value = cssValuePool().createExplicitInitialValue().get(); 1339 value = cssValuePool().createExplicitInitialValue().get();
1340 } 1340 }
1341 StyleBuilder::applyProperty(propertyId, state, value); 1341 StyleBuilder::applyProperty(propertyId, state, value);
1342 } 1342 }
1343 } 1343 }
1344 1344
1345 template <StyleResolver::StyleApplicationPass pass> 1345 template <StyleResolver::StyleApplicationPass pass>
1346 void StyleResolver::applyProperties(StyleResolverState& state, const StyleProper tySet* properties, StyleRule* rule, bool isImportant, bool inheritedOnly, Proper tyWhitelistType propertyWhitelistType) 1346 void StyleResolver::applyProperties(StyleResolverState& state, const StyleProper tySet* properties, StyleRule* rule, bool isImportant, bool inheritedOnly, Proper tyWhitelistType propertyWhitelistType)
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
1600 visitor->trace(m_uncommonAttributeRuleSet); 1600 visitor->trace(m_uncommonAttributeRuleSet);
1601 visitor->trace(m_watchedSelectorsRules); 1601 visitor->trace(m_watchedSelectorsRules);
1602 visitor->trace(m_treeBoundaryCrossingRules); 1602 visitor->trace(m_treeBoundaryCrossingRules);
1603 visitor->trace(m_styleSharingLists); 1603 visitor->trace(m_styleSharingLists);
1604 visitor->trace(m_pendingStyleSheets); 1604 visitor->trace(m_pendingStyleSheets);
1605 visitor->trace(m_document); 1605 visitor->trace(m_document);
1606 #endif 1606 #endif
1607 } 1607 }
1608 1608
1609 } // namespace blink 1609 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698