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

Unified Diff: trunk/Source/core/css/resolver/AnimatedStyleBuilder.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/parser/CSSPropertyParser.cpp ('k') | trunk/Source/core/css/resolver/FontBuilder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/Source/core/css/resolver/AnimatedStyleBuilder.cpp
===================================================================
--- trunk/Source/core/css/resolver/AnimatedStyleBuilder.cpp (revision 169272)
+++ trunk/Source/core/css/resolver/AnimatedStyleBuilder.cpp (working copy)
@@ -225,26 +225,6 @@
}
}
-FontStretch animatableValueToFontStretch(const AnimatableValue* value)
-{
- ASSERT(FontStretchUltraCondensed == 1 && FontStretchUltraExpanded == 9);
- unsigned index = round(toAnimatableDouble(value)->toDouble()) - 1;
- static const FontStretch stretchValues[] = {
- FontStretchUltraCondensed,
- FontStretchExtraCondensed,
- FontStretchCondensed,
- FontStretchSemiCondensed,
- FontStretchNormal,
- FontStretchSemiExpanded,
- FontStretchExpanded,
- FontStretchExtraExpanded,
- FontStretchUltraExpanded
- };
-
- index = clampTo<unsigned>(index, 0, WTF_ARRAY_LENGTH(stretchValues) - 1);
- return stretchValues[index];
-}
-
FontWeight animatableValueToFontWeight(const AnimatableValue* value)
{
int index = round(toAnimatableDouble(value)->toDouble() / 100) - 1;
@@ -392,9 +372,6 @@
case CSSPropertyFontSize:
style->setFontSize(clampTo<float>(toAnimatableDouble(value)->toDouble(), 0));
return;
- case CSSPropertyFontStretch:
- style->setFontStretch(animatableValueToFontStretch(value));
- return;
case CSSPropertyFontWeight:
style->setFontWeight(animatableValueToFontWeight(value));
return;
« no previous file with comments | « trunk/Source/core/css/parser/CSSPropertyParser.cpp ('k') | trunk/Source/core/css/resolver/FontBuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698