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

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

Issue 195823006: Revert 169264 "Add plumbing for font-stretch" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 years, 9 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 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 case CSSPropertyBackgroundPositionX: 1115 case CSSPropertyBackgroundPositionX:
1116 case CSSPropertyBackgroundPositionY: 1116 case CSSPropertyBackgroundPositionY:
1117 case CSSPropertyBackgroundRepeat: 1117 case CSSPropertyBackgroundRepeat:
1118 case CSSPropertyBackgroundRepeatX: 1118 case CSSPropertyBackgroundRepeatX:
1119 case CSSPropertyBackgroundRepeatY: 1119 case CSSPropertyBackgroundRepeatY:
1120 case CSSPropertyBackgroundSize: 1120 case CSSPropertyBackgroundSize:
1121 case CSSPropertyColor: 1121 case CSSPropertyColor:
1122 case CSSPropertyFont: 1122 case CSSPropertyFont:
1123 case CSSPropertyFontFamily: 1123 case CSSPropertyFontFamily:
1124 case CSSPropertyFontSize: 1124 case CSSPropertyFontSize:
1125 case CSSPropertyFontStretch:
1126 case CSSPropertyFontStyle: 1125 case CSSPropertyFontStyle:
1127 case CSSPropertyFontVariant: 1126 case CSSPropertyFontVariant:
1128 case CSSPropertyFontWeight: 1127 case CSSPropertyFontWeight:
1129 case CSSPropertyLineHeight: 1128 case CSSPropertyLineHeight:
1130 case CSSPropertyOpacity: 1129 case CSSPropertyOpacity:
1131 case CSSPropertyOutline: 1130 case CSSPropertyOutline:
1132 case CSSPropertyOutlineColor: 1131 case CSSPropertyOutlineColor:
1133 case CSSPropertyOutlineOffset: 1132 case CSSPropertyOutlineOffset:
1134 case CSSPropertyOutlineStyle: 1133 case CSSPropertyOutlineStyle:
1135 case CSSPropertyOutlineWidth: 1134 case CSSPropertyOutlineWidth:
(...skipping 17 matching lines...) Expand all
1153 1152
1154 template <StyleResolver::StyleApplicationPass pass> 1153 template <StyleResolver::StyleApplicationPass pass>
1155 bool StyleResolver::isPropertyForPass(CSSPropertyID property) 1154 bool StyleResolver::isPropertyForPass(CSSPropertyID property)
1156 { 1155 {
1157 const CSSPropertyID firstAnimationProperty = CSSPropertyDisplay; 1156 const CSSPropertyID firstAnimationProperty = CSSPropertyDisplay;
1158 const CSSPropertyID lastAnimationProperty = CSSPropertyTransitionTimingFunct ion; 1157 const CSSPropertyID lastAnimationProperty = CSSPropertyTransitionTimingFunct ion;
1159 COMPILE_ASSERT(firstCSSProperty == firstAnimationProperty, CSS_first_animati on_property_should_be_first_property); 1158 COMPILE_ASSERT(firstCSSProperty == firstAnimationProperty, CSS_first_animati on_property_should_be_first_property);
1160 const CSSPropertyID firstHighPriorityProperty = CSSPropertyColor; 1159 const CSSPropertyID firstHighPriorityProperty = CSSPropertyColor;
1161 const CSSPropertyID lastHighPriorityProperty = CSSPropertyLineHeight; 1160 const CSSPropertyID lastHighPriorityProperty = CSSPropertyLineHeight;
1162 COMPILE_ASSERT(lastAnimationProperty + 1 == firstHighPriorityProperty, CSS_c olor_is_first_high_priority_property); 1161 COMPILE_ASSERT(lastAnimationProperty + 1 == firstHighPriorityProperty, CSS_c olor_is_first_high_priority_property);
1163 COMPILE_ASSERT(CSSPropertyLineHeight == firstHighPriorityProperty + 18, CSS_ line_height_is_end_of_high_prioity_property_range); 1162 COMPILE_ASSERT(CSSPropertyLineHeight == firstHighPriorityProperty + 17, CSS_ line_height_is_end_of_high_prioity_property_range);
1164 COMPILE_ASSERT(CSSPropertyZoom == lastHighPriorityProperty - 1, CSS_zoom_is_ before_line_height); 1163 COMPILE_ASSERT(CSSPropertyZoom == lastHighPriorityProperty - 1, CSS_zoom_is_ before_line_height);
1165 switch (pass) { 1164 switch (pass) {
1166 case AnimationProperties: 1165 case AnimationProperties:
1167 return property >= firstAnimationProperty && property <= lastAnimationPr operty; 1166 return property >= firstAnimationProperty && property <= lastAnimationPr operty;
1168 case HighPriorityProperties: 1167 case HighPriorityProperties:
1169 return property >= firstHighPriorityProperty && property <= lastHighPrio rityProperty; 1168 return property >= firstHighPriorityProperty && property <= lastHighPrio rityProperty;
1170 case LowPriorityProperties: 1169 case LowPriorityProperties:
1171 return property > lastHighPriorityProperty; 1170 return property > lastHighPriorityProperty;
1172 } 1171 }
1173 ASSERT_NOT_REACHED(); 1172 ASSERT_NOT_REACHED();
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 bool StyleResolver::mediaQueryAffectedByViewportChange() const 1408 bool StyleResolver::mediaQueryAffectedByViewportChange() const
1410 { 1409 {
1411 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) { 1410 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
1412 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result) 1411 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result)
1413 return true; 1412 return true;
1414 } 1413 }
1415 return false; 1414 return false;
1416 } 1415 }
1417 1416
1418 } // namespace WebCore 1417 } // namespace WebCore
OLDNEW
« no previous file with comments | « trunk/Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | trunk/Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698