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

Unified Diff: trunk/Source/core/css/resolver/StyleBuilderCustom.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/Source/core/css/resolver/FontBuilder.cpp ('k') | trunk/Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/Source/core/css/resolver/StyleBuilderCustom.cpp
===================================================================
--- trunk/Source/core/css/resolver/StyleBuilderCustom.cpp (revision 169272)
+++ trunk/Source/core/css/resolver/StyleBuilderCustom.cpp (working copy)
@@ -295,58 +295,6 @@
}
}
-
-void StyleBuilderFunctions::applyInitialCSSPropertyFontStretch(StyleResolverState& state)
-{
- state.fontBuilder().setStretch(FontStretchNormal);
-}
-
-void StyleBuilderFunctions::applyInheritCSSPropertyFontStretch(StyleResolverState& state)
-{
- state.fontBuilder().setStretch(state.parentFontDescription().stretch());
-}
-
-void StyleBuilderFunctions::applyValueCSSPropertyFontStretch(StyleResolverState& state, CSSValue* value)
-{
- if (!value->isPrimitiveValue())
- return;
- CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
- switch (primitiveValue->getValueID()) {
- case CSSValueInvalid:
- ASSERT_NOT_REACHED();
- break;
- case CSSValueUltraCondensed:
- state.fontBuilder().setStretch(FontStretchUltraCondensed);
- break;
- case CSSValueExtraCondensed:
- state.fontBuilder().setStretch(FontStretchExtraCondensed);
- break;
- case CSSValueCondensed:
- state.fontBuilder().setStretch(FontStretchCondensed);
- break;
- case CSSValueSemiCondensed:
- state.fontBuilder().setStretch(FontStretchSemiCondensed);
- break;
- case CSSValueNormal:
- state.fontBuilder().setStretch(FontStretchNormal);
- break;
- case CSSValueSemiExpanded:
- state.fontBuilder().setStretch(FontStretchSemiExpanded);
- break;
- case CSSValueExpanded:
- state.fontBuilder().setStretch(FontStretchExpanded);
- break;
- case CSSValueExtraExpanded:
- state.fontBuilder().setStretch(FontStretchExtraExpanded);
- break;
- case CSSValueUltraExpanded:
- state.fontBuilder().setStretch(FontStretchUltraExpanded);
- break;
- default:
- return;
- }
-}
-
void StyleBuilderFunctions::applyValueCSSPropertyLineHeight(StyleResolverState& state, CSSValue* value)
{
if (!value->isPrimitiveValue())
@@ -1562,6 +1510,7 @@
ASSERT(newId != id);
return applyProperty(newId, state, value);
}
+ case CSSPropertyFontStretch:
case CSSPropertyPage:
case CSSPropertyTextLineThroughColor:
case CSSPropertyTextLineThroughMode:
@@ -1855,7 +1804,6 @@
case CSSPropertyFloat:
case CSSPropertyFontKerning:
case CSSPropertyFontSize:
- case CSSPropertyFontStretch:
case CSSPropertyFontStyle:
case CSSPropertyFontVariant:
case CSSPropertyFontVariantLigatures:
« no previous file with comments | « trunk/Source/core/css/resolver/FontBuilder.cpp ('k') | trunk/Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698