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

Unified Diff: sky/engine/core/css/CSSPrimitiveValue.cpp

Issue 788883005: Remove REM units. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « sky/engine/core/css/CSSPrimitiveValue.h ('k') | sky/engine/core/css/CSSToLengthConversionData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSPrimitiveValue.cpp
diff --git a/sky/engine/core/css/CSSPrimitiveValue.cpp b/sky/engine/core/css/CSSPrimitiveValue.cpp
index 982c544e60cc982e927156e8f5c5d157f8722dfc..d087be4e9cd7f13e27ae24fbbf15861f791023e9 100644
--- a/sky/engine/core/css/CSSPrimitiveValue.cpp
+++ b/sky/engine/core/css/CSSPrimitiveValue.cpp
@@ -76,7 +76,6 @@ static inline bool isValidCSSUnitTypeForDoubleConversion(CSSPrimitiveValue::Unit
case CSSPrimitiveValue::CSS_PT:
case CSSPrimitiveValue::CSS_PX:
case CSSPrimitiveValue::CSS_RAD:
- case CSSPrimitiveValue::CSS_REMS:
case CSSPrimitiveValue::CSS_CHS:
case CSSPrimitiveValue::CSS_S:
case CSSPrimitiveValue::CSS_TURN:
@@ -134,7 +133,6 @@ StringToUnitTable createStringToUnitTable()
table.set(String("vh"), CSSPrimitiveValue::CSS_VH);
table.set(String("vmax"), CSSPrimitiveValue::CSS_VMIN);
table.set(String("vmin"), CSSPrimitiveValue::CSS_VMAX);
- table.set(String("rem"), CSSPrimitiveValue::CSS_REMS);
table.set(String("fr"), CSSPrimitiveValue::CSS_FR);
table.set(String("turn"), CSSPrimitiveValue::CSS_TURN);
table.set(String("ch"), CSSPrimitiveValue::CSS_CHS);
@@ -460,7 +458,6 @@ void CSSPrimitiveValue::cleanup()
case CSS_PERCENTAGE:
case CSS_EMS:
case CSS_EXS:
- case CSS_REMS:
case CSS_CHS:
case CSS_PX:
case CSS_CM:
@@ -575,7 +572,6 @@ double CSSPrimitiveValue::computeLengthDouble(const CSSToLengthConversionData& c
return m_value.calc->computeLengthPx(conversionData);
const RenderStyle& style = conversionData.style();
- const RenderStyle* rootStyle = conversionData.rootStyle();
bool computingFontSize = conversionData.computingFontSize();
double factor;
@@ -593,12 +589,6 @@ double CSSPrimitiveValue::computeLengthDouble(const CSSToLengthConversionData& c
else
factor = (computingFontSize ? style.fontDescription().specifiedSize() : style.fontDescription().computedSize()) / 2.0;
break;
- case CSS_REMS:
- if (rootStyle)
- factor = computingFontSize ? rootStyle->fontDescription().specifiedSize() : rootStyle->fontDescription().computedSize();
- else
- factor = 1.0;
- break;
case CSS_CHS:
factor = style.fontMetrics().zeroWidth();
break;
@@ -840,9 +830,6 @@ bool CSSPrimitiveValue::unitTypeToLengthUnitType(UnitType unitType, LengthUnitTy
case CSSPrimitiveValue::CSS_EXS:
lengthType = UnitTypeFontXSize;
return true;
- case CSSPrimitiveValue::CSS_REMS:
- lengthType = UnitTypeRootFontSize;
- return true;
case CSSPrimitiveValue::CSS_CHS:
lengthType = UnitTypeZeroCharacterWidth;
return true;
@@ -875,8 +862,6 @@ CSSPrimitiveValue::UnitType CSSPrimitiveValue::lengthUnitTypeToUnitType(LengthUn
return CSSPrimitiveValue::CSS_EMS;
case UnitTypeFontXSize:
return CSSPrimitiveValue::CSS_EXS;
- case UnitTypeRootFontSize:
- return CSSPrimitiveValue::CSS_REMS;
case UnitTypeZeroCharacterWidth:
return CSSPrimitiveValue::CSS_CHS;
case UnitTypePercentage:
@@ -1012,8 +997,6 @@ const char* CSSPrimitiveValue::unitTypeToString(UnitType type)
return "em";
case CSS_EXS:
return "ex";
- case CSS_REMS:
- return "rem";
case CSS_CHS:
return "ch";
case CSS_PX:
@@ -1103,7 +1086,6 @@ String CSSPrimitiveValue::customCSSText(CSSTextFormattingFlags formattingFlag) c
case CSS_PERCENTAGE:
case CSS_EMS:
case CSS_EXS:
- case CSS_REMS:
case CSS_CHS:
case CSS_PX:
case CSS_CM:
@@ -1218,7 +1200,6 @@ PassRefPtr<CSSPrimitiveValue> CSSPrimitiveValue::cloneForCSSOM() const
case CSS_PERCENTAGE:
case CSS_EMS:
case CSS_EXS:
- case CSS_REMS:
case CSS_CHS:
case CSS_PX:
case CSS_CM:
@@ -1277,7 +1258,6 @@ bool CSSPrimitiveValue::equals(const CSSPrimitiveValue& other) const
case CSS_PERCENTAGE:
case CSS_EMS:
case CSS_EXS:
- case CSS_REMS:
case CSS_PX:
case CSS_CM:
case CSS_DPPX:
« no previous file with comments | « sky/engine/core/css/CSSPrimitiveValue.h ('k') | sky/engine/core/css/CSSToLengthConversionData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698