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

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: mark paint-order inherited 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
« no previous file with comments | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/editing/EditingStyle.cpp » ('j') | 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. 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 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after
1329 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand 1329 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand
1330 // We skip applyProperty when a given property is unicode-bidi or 1330 // We skip applyProperty when a given property is unicode-bidi or
1331 // direction. 1331 // direction.
1332 if (!CSSProperty::isAffectedByAllProperty(propertyId)) 1332 if (!CSSProperty::isAffectedByAllProperty(propertyId))
1333 continue; 1333 continue;
1334 1334
1335 CSSValue* value; 1335 CSSValue* value;
1336 if (!isUnsetValue) { 1336 if (!isUnsetValue) {
1337 value = allValue; 1337 value = allValue;
1338 } else { 1338 } else {
1339 if (CSSProperty::isInheritedProperty(propertyId)) 1339 if (CSSPropertyMetadata::isInheritedProperty(propertyId))
1340 value = cssValuePool().createInheritedValue().get(); 1340 value = cssValuePool().createInheritedValue().get();
1341 else 1341 else
1342 value = cssValuePool().createExplicitInitialValue().get(); 1342 value = cssValuePool().createExplicitInitialValue().get();
1343 } 1343 }
1344 StyleBuilder::applyProperty(propertyId, state, value); 1344 StyleBuilder::applyProperty(propertyId, state, value);
1345 } 1345 }
1346 } 1346 }
1347 1347
1348 template <StyleResolver::StyleApplicationPass pass> 1348 template <StyleResolver::StyleApplicationPass pass>
1349 void StyleResolver::applyProperties(StyleResolverState& state, const StyleProper tySet* properties, StyleRule* rule, bool isImportant, bool inheritedOnly, Proper tyWhitelistType propertyWhitelistType) 1349 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
1603 visitor->trace(m_uncommonAttributeRuleSet); 1603 visitor->trace(m_uncommonAttributeRuleSet);
1604 visitor->trace(m_watchedSelectorsRules); 1604 visitor->trace(m_watchedSelectorsRules);
1605 visitor->trace(m_treeBoundaryCrossingRules); 1605 visitor->trace(m_treeBoundaryCrossingRules);
1606 visitor->trace(m_styleSharingLists); 1606 visitor->trace(m_styleSharingLists);
1607 visitor->trace(m_pendingStyleSheets); 1607 visitor->trace(m_pendingStyleSheets);
1608 visitor->trace(m_document); 1608 visitor->trace(m_document);
1609 #endif 1609 #endif
1610 } 1610 }
1611 1611
1612 } // namespace blink 1612 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/editing/EditingStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698