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

Unified Diff: trunk/Source/core/css/CSSComputedStyleDeclaration.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
Index: trunk/Source/core/css/CSSComputedStyleDeclaration.cpp
===================================================================
--- trunk/Source/core/css/CSSComputedStyleDeclaration.cpp (revision 169272)
+++ trunk/Source/core/css/CSSComputedStyleDeclaration.cpp (working copy)
@@ -130,7 +130,6 @@
CSSPropertyFontFamily,
CSSPropertyFontKerning,
CSSPropertyFontSize,
- CSSPropertyFontStretch,
CSSPropertyFontStyle,
CSSPropertyFontVariant,
CSSPropertyFontVariantLigatures,
@@ -1392,32 +1391,6 @@
return zoomAdjustedPixelValue(style.fontDescription().computedPixelSize(), style);
}
-static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForFontStretch(RenderStyle& style)
-{
- switch (style.fontDescription().stretch()) {
- case FontStretchUltraCondensed:
- return cssValuePool().createIdentifierValue(CSSValueUltraCondensed);
- case FontStretchExtraCondensed:
- return cssValuePool().createIdentifierValue(CSSValueExtraCondensed);
- case FontStretchCondensed:
- return cssValuePool().createIdentifierValue(CSSValueCondensed);
- case FontStretchSemiCondensed:
- return cssValuePool().createIdentifierValue(CSSValueSemiCondensed);
- case FontStretchNormal:
- return cssValuePool().createIdentifierValue(CSSValueNormal);
- case FontStretchSemiExpanded:
- return cssValuePool().createIdentifierValue(CSSValueSemiExpanded);
- case FontStretchExpanded:
- return cssValuePool().createIdentifierValue(CSSValueExpanded);
- case FontStretchExtraExpanded:
- return cssValuePool().createIdentifierValue(CSSValueExtraExpanded);
- case FontStretchUltraExpanded:
- return cssValuePool().createIdentifierValue(CSSValueUltraExpanded);
- }
- ASSERT_NOT_REACHED();
- return cssValuePool().createIdentifierValue(CSSValueNormal);
-}
-
static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForFontStyle(RenderStyle& style)
{
if (style.fontDescription().italic())
@@ -1942,7 +1915,6 @@
computedFont->style = valueForFontStyle(*style);
computedFont->variant = valueForFontVariant(*style);
computedFont->weight = valueForFontWeight(*style);
- computedFont->stretch = valueForFontStretch(*style);
computedFont->size = valueForFontSize(*style);
computedFont->lineHeight = valueForLineHeight(*style);
computedFont->family = valueForFontFamily(*style);
@@ -1958,8 +1930,6 @@
}
case CSSPropertyFontSize:
return valueForFontSize(*style);
- case CSSPropertyFontStretch:
- return valueForFontStretch(*style);
case CSSPropertyFontStyle:
return valueForFontStyle(*style);
case CSSPropertyFontVariant:
@@ -2799,6 +2769,7 @@
break;
/* Unimplemented @font-face properties */
+ case CSSPropertyFontStretch:
case CSSPropertySrc:
case CSSPropertyUnicodeRange:
break;
« no previous file with comments | « trunk/LayoutTests/inspector/console/console-format-style-whitelist-expected.txt ('k') | trunk/Source/core/css/CSSFontValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698