Remove REM units.

sky/engine/core/css/CSSPrimitiveValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 58 matching lines @@
     case CSSPrimitiveValue::CSS_IN:
     case CSSPrimitiveValue::CSS_KHZ:
     case CSSPrimitiveValue::CSS_MM:
     case CSSPrimitiveValue::CSS_MS:
     case CSSPrimitiveValue::CSS_NUMBER:
     case CSSPrimitiveValue::CSS_PERCENTAGE:
     case CSSPrimitiveValue::CSS_PC:
     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:
     case CSSPrimitiveValue::CSS_VW:
     case CSSPrimitiveValue::CSS_VH:
     case CSSPrimitiveValue::CSS_VMIN:
     case CSSPrimitiveValue::CSS_VMAX:
     case CSSPrimitiveValue::CSS_FR:
         return true;
     case CSSPrimitiveValue::CSS_ATTR:
@@ skipping 37 matching lines @@
     table.set(String("s"), CSSPrimitiveValue::CSS_S);
     table.set(String("hz"), CSSPrimitiveValue::CSS_HZ);
     table.set(String("khz"), CSSPrimitiveValue::CSS_KHZ);
     table.set(String("dpi"), CSSPrimitiveValue::CSS_DPI);
     table.set(String("dpcm"), CSSPrimitiveValue::CSS_DPCM);
     table.set(String("dppx"), CSSPrimitiveValue::CSS_DPPX);
     table.set(String("vw"), CSSPrimitiveValue::CSS_VW);
     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);
     return table;
 }
 
 CSSPrimitiveValue::UnitType CSSPrimitiveValue::fromName(const String& unit)
 {
     DEFINE_STATIC_LOCAL(StringToUnitTable, unitTable, (createStringToUnitTable()));
     return unitTable.get(unit.lower());
@@ skipping 305 matching lines @@
     case CSS_SHAPE:
         // We must not call deref() when oilpan is enabled because m_value.shape is traced.
 #if !ENABLE(OILPAN)
         m_value.shape->deref();
 #endif
         break;
     case CSS_NUMBER:
     case CSS_PERCENTAGE:
     case CSS_EMS:
     case CSS_EXS:
-    case CSS_REMS:
     case CSS_CHS:
     case CSS_PX:
     case CSS_CM:
     case CSS_MM:
     case CSS_IN:
     case CSS_PT:
     case CSS_PC:
     case CSS_DEG:
     case CSS_RAD:
     case CSS_GRAD:
@@ skipping 94 matching lines @@
 
 double CSSPrimitiveValue::computeLengthDouble(const CSSToLengthConversionData& conversionData)
 {
     // The logic in this function is duplicated in MediaValues::computeLength
     // because MediaValues::computeLength needs nearly identical logic, but we haven't found a way to make
     // CSSPrimitiveValue::computeLengthDouble more generic (to solve both cases) without hurting performance.
     if (m_primitiveUnitType == CSS_CALC)
         return m_value.calc->computeLengthPx(conversionData);
 
     const RenderStyle& style = conversionData.style();
-    const RenderStyle* rootStyle = conversionData.rootStyle();
     bool computingFontSize = conversionData.computingFontSize();
 
     double factor;
 
     switch (primitiveType()) {
         case CSS_EMS:
             factor = computingFontSize ? style.fontDescription().specifiedSize() : style.fontDescription().computedSize();
             break;
         case CSS_EXS:
             // FIXME: We have a bug right now where the zoom will be applied twice to EX units.
             // We really need to compute EX using fontMetrics for the original specifiedSize and not use
             // our actual constructed rendering font.
             if (style.fontMetrics().hasXHeight())
                 factor = style.fontMetrics().xHeight();
             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;
         case CSS_PX:
             factor = 1.0;
             break;
         case CSS_CM:
             factor = cssPixelsPerCentimeter;
             break;
         case CSS_MM:
@@ skipping 221 matching lines @@
     case CSSPrimitiveValue::CSS_PT:
     case CSSPrimitiveValue::CSS_PC:
         lengthType = UnitTypePixels;
         return true;
     case CSSPrimitiveValue::CSS_EMS:
         lengthType = UnitTypeFontSize;
         return true;
     case CSSPrimitiveValue::CSS_EXS:
         lengthType = UnitTypeFontXSize;
         return true;
-    case CSSPrimitiveValue::CSS_REMS:
-        lengthType = UnitTypeRootFontSize;
-        return true;
     case CSSPrimitiveValue::CSS_CHS:
         lengthType = UnitTypeZeroCharacterWidth;
         return true;
     case CSSPrimitiveValue::CSS_PERCENTAGE:
         lengthType = UnitTypePercentage;
         return true;
     case CSSPrimitiveValue::CSS_VW:
         lengthType = UnitTypeViewportWidth;
         return true;
     case CSSPrimitiveValue::CSS_VH:
@@ skipping 12 matching lines @@
 
 CSSPrimitiveValue::UnitType CSSPrimitiveValue::lengthUnitTypeToUnitType(LengthUnitType type)
 {
     switch (type) {
     case UnitTypePixels:
         return CSSPrimitiveValue::CSS_PX;
     case UnitTypeFontSize:
         return CSSPrimitiveValue::CSS_EMS;
     case UnitTypeFontXSize:
         return CSSPrimitiveValue::CSS_EXS;
-    case UnitTypeRootFontSize:
-        return CSSPrimitiveValue::CSS_REMS;
     case UnitTypeZeroCharacterWidth:
         return CSSPrimitiveValue::CSS_CHS;
     case UnitTypePercentage:
         return CSSPrimitiveValue::CSS_PERCENTAGE;
     case UnitTypeViewportWidth:
         return CSSPrimitiveValue::CSS_VW;
     case UnitTypeViewportHeight:
         return CSSPrimitiveValue::CSS_VH;
     case UnitTypeViewportMin:
         return CSSPrimitiveValue::CSS_VMIN;
@@ skipping 115 matching lines @@
 {
     switch (type) {
     case CSS_NUMBER:
         return "";
     case CSS_PERCENTAGE:
         return "%";
     case CSS_EMS:
         return "em";
     case CSS_EXS:
         return "ex";
-    case CSS_REMS:
-        return "rem";
     case CSS_CHS:
         return "ch";
     case CSS_PX:
         return "px";
     case CSS_CM:
         return "cm";
     case CSS_DPPX:
         return "dppx";
     case CSS_DPI:
         return "dpi";
@@ skipping 69 matching lines @@
 
     String text;
     switch (m_primitiveUnitType) {
         case CSS_UNKNOWN:
             // FIXME
             break;
         case CSS_NUMBER:
         case CSS_PERCENTAGE:
         case CSS_EMS:
         case CSS_EXS:
-        case CSS_REMS:
         case CSS_CHS:
         case CSS_PX:
         case CSS_CM:
         case CSS_DPPX:
         case CSS_DPI:
         case CSS_DPCM:
         case CSS_MM:
         case CSS_IN:
         case CSS_PT:
         case CSS_PC:
@@ skipping 94 matching lines @@
         result = CSSPrimitiveValue::create(m_value.calc);
         break;
     case CSS_SHAPE:
         // CSSShapeValue is not exposed to the CSSOM, no need for a deep clone.
         result = CSSPrimitiveValue::create(m_value.shape);
         break;
     case CSS_NUMBER:
     case CSS_PERCENTAGE:
     case CSS_EMS:
     case CSS_EXS:
-    case CSS_REMS:
     case CSS_CHS:
     case CSS_PX:
     case CSS_CM:
     case CSS_MM:
     case CSS_IN:
     case CSS_PT:
     case CSS_PC:
     case CSS_DEG:
     case CSS_RAD:
     case CSS_GRAD:
@@ skipping 38 matching lines @@
     if (m_primitiveUnitType != other.m_primitiveUnitType)
         return false;
 
     switch (m_primitiveUnitType) {
     case CSS_UNKNOWN:
         return false;
     case CSS_NUMBER:
     case CSS_PERCENTAGE:
     case CSS_EMS:
     case CSS_EXS:
-    case CSS_REMS:
     case CSS_PX:
     case CSS_CM:
     case CSS_DPPX:
     case CSS_DPI:
     case CSS_DPCM:
     case CSS_MM:
     case CSS_IN:
     case CSS_PT:
     case CSS_PC:
     case CSS_DEG:
@@ skipping 30 matching lines @@
         return m_value.pair && other.m_value.pair && m_value.pair->equals(*other.m_value.pair);
     case CSS_CALC:
         return m_value.calc && other.m_value.calc && m_value.calc->equals(*other.m_value.calc);
     case CSS_SHAPE:
         return m_value.shape && other.m_value.shape && m_value.shape->equals(*other.m_value.shape);
     }
     return false;
 }
 
 } // namespace blink