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

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

Issue 203523002: Reland "Add plumbing for font-stretch" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: w/fix for ASSERT Created 6 years, 5 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 | Annotate | Revision Log
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 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 case CSSPropertyBackgroundPositionX: 1074 case CSSPropertyBackgroundPositionX:
1075 case CSSPropertyBackgroundPositionY: 1075 case CSSPropertyBackgroundPositionY:
1076 case CSSPropertyBackgroundRepeat: 1076 case CSSPropertyBackgroundRepeat:
1077 case CSSPropertyBackgroundRepeatX: 1077 case CSSPropertyBackgroundRepeatX:
1078 case CSSPropertyBackgroundRepeatY: 1078 case CSSPropertyBackgroundRepeatY:
1079 case CSSPropertyBackgroundSize: 1079 case CSSPropertyBackgroundSize:
1080 case CSSPropertyColor: 1080 case CSSPropertyColor:
1081 case CSSPropertyFont: 1081 case CSSPropertyFont:
1082 case CSSPropertyFontFamily: 1082 case CSSPropertyFontFamily:
1083 case CSSPropertyFontSize: 1083 case CSSPropertyFontSize:
1084 case CSSPropertyFontStretch:
1084 case CSSPropertyFontStyle: 1085 case CSSPropertyFontStyle:
1085 case CSSPropertyFontVariant: 1086 case CSSPropertyFontVariant:
1086 case CSSPropertyFontWeight: 1087 case CSSPropertyFontWeight:
1087 case CSSPropertyLineHeight: 1088 case CSSPropertyLineHeight:
1088 case CSSPropertyOpacity: 1089 case CSSPropertyOpacity:
1089 case CSSPropertyOutline: 1090 case CSSPropertyOutline:
1090 case CSSPropertyOutlineColor: 1091 case CSSPropertyOutlineColor:
1091 case CSSPropertyOutlineOffset: 1092 case CSSPropertyOutlineOffset:
1092 case CSSPropertyOutlineStyle: 1093 case CSSPropertyOutlineStyle:
1093 case CSSPropertyOutlineWidth: 1094 case CSSPropertyOutlineWidth:
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 // lastCSSPropertyId<HighPriorityProperties>. 1241 // lastCSSPropertyId<HighPriorityProperties>.
1241 template<> CSSPropertyID StyleResolver::firstCSSPropertyId<StyleResolver::HighPr iorityProperties>() 1242 template<> CSSPropertyID StyleResolver::firstCSSPropertyId<StyleResolver::HighPr iorityProperties>()
1242 { 1243 {
1243 COMPILE_ASSERT(CSSPropertyColor == firstCSSProperty, CSS_color_is_first_high _priority_property); 1244 COMPILE_ASSERT(CSSPropertyColor == firstCSSProperty, CSS_color_is_first_high _priority_property);
1244 return CSSPropertyColor; 1245 return CSSPropertyColor;
1245 } 1246 }
1246 1247
1247 // This method returns the last CSSPropertyId of high priority properties. 1248 // This method returns the last CSSPropertyId of high priority properties.
1248 template<> CSSPropertyID StyleResolver::lastCSSPropertyId<StyleResolver::HighPri orityProperties>() 1249 template<> CSSPropertyID StyleResolver::lastCSSPropertyId<StyleResolver::HighPri orityProperties>()
1249 { 1250 {
1250 COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyColor + 17, CSS_line_heig ht_is_end_of_high_prioity_property_range); 1251 COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyColor + 18, CSS_line_heig ht_is_end_of_high_prioity_property_range);
1251 COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyLineHeight - 1, CSS_zoom_is_bef ore_line_height); 1252 COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyLineHeight - 1, CSS_zoom_is_bef ore_line_height);
1252 return CSSPropertyLineHeight; 1253 return CSSPropertyLineHeight;
1253 } 1254 }
1254 1255
1255 // This method returns the first CSSPropertyId of remaining properties, 1256 // This method returns the first CSSPropertyId of remaining properties,
1256 // i.e. low priority properties. No properties depend on low priority 1257 // i.e. low priority properties. No properties depend on low priority
1257 // properties. So we don't need to resolve such properties quickly. 1258 // properties. So we don't need to resolve such properties quickly.
1258 // All low priority properties are obtained by using 1259 // All low priority properties are obtained by using
1259 // firstCSSPropertyId<LowPriorityProperties> and 1260 // firstCSSPropertyId<LowPriorityProperties> and
1260 // lastCSSPropertyId<LowPriorityProperties>. 1261 // lastCSSPropertyId<LowPriorityProperties>.
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
1570 visitor->trace(m_siblingRuleSet); 1571 visitor->trace(m_siblingRuleSet);
1571 visitor->trace(m_uncommonAttributeRuleSet); 1572 visitor->trace(m_uncommonAttributeRuleSet);
1572 visitor->trace(m_watchedSelectorsRules); 1573 visitor->trace(m_watchedSelectorsRules);
1573 visitor->trace(m_treeBoundaryCrossingRules); 1574 visitor->trace(m_treeBoundaryCrossingRules);
1574 visitor->trace(m_pendingStyleSheets); 1575 visitor->trace(m_pendingStyleSheets);
1575 visitor->trace(m_styleTree); 1576 visitor->trace(m_styleTree);
1576 #endif 1577 #endif
1577 } 1578 }
1578 1579
1579 } // namespace blink 1580 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698