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

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

Issue 415613002: Merge CSSPropertyNames.in and SVGCSSPropertyNames.in with 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 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 } 1281 }
1282 1282
1283 // This method returns the first CSSPropertyId of remaining properties, 1283 // This method returns the first CSSPropertyId of remaining properties,
1284 // i.e. low priority properties. No properties depend on low priority 1284 // i.e. low priority properties. No properties depend on low priority
1285 // properties. So we don't need to resolve such properties quickly. 1285 // properties. So we don't need to resolve such properties quickly.
1286 // All low priority properties are obtained by using 1286 // All low priority properties are obtained by using
1287 // firstCSSPropertyId<LowPriorityProperties> and 1287 // firstCSSPropertyId<LowPriorityProperties> and
1288 // lastCSSPropertyId<LowPriorityProperties>. 1288 // lastCSSPropertyId<LowPriorityProperties>.
1289 template<> CSSPropertyID StyleResolver::firstCSSPropertyId<StyleResolver::LowPri orityProperties>() 1289 template<> CSSPropertyID StyleResolver::firstCSSPropertyId<StyleResolver::LowPri orityProperties>()
1290 { 1290 {
1291 COMPILE_ASSERT(CSSPropertyBackground == CSSPropertyLineHeight + 1, CSS_backg round_is_first_low_priority_property); 1291 COMPILE_ASSERT(CSSPropertyAlignContent == CSSPropertyLineHeight + 1, CSS_bac kground_is_first_low_priority_property);
1292 return CSSPropertyBackground; 1292 return CSSPropertyAlignContent;
1293 } 1293 }
1294 1294
1295 // This method returns the last CSSPropertyId of low priority properties. 1295 // This method returns the last CSSPropertyId of low priority properties.
1296 template<> CSSPropertyID StyleResolver::lastCSSPropertyId<StyleResolver::LowPrio rityProperties>() 1296 template<> CSSPropertyID StyleResolver::lastCSSPropertyId<StyleResolver::LowPrio rityProperties>()
1297 { 1297 {
1298 return static_cast<CSSPropertyID>(lastCSSProperty); 1298 return static_cast<CSSPropertyID>(lastCSSProperty);
1299 } 1299 }
1300 1300
1301 template <StyleResolver::StyleApplicationPass pass> 1301 template <StyleResolver::StyleApplicationPass pass>
1302 bool StyleResolver::isPropertyForPass(CSSPropertyID property) 1302 bool StyleResolver::isPropertyForPass(CSSPropertyID property)
(...skipping 297 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