Avoid use of CSSValue in MediaQueryExp and MediaQueryEvaluator

Source/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 94 matching lines @@
     case CSSPrimitiveValue::CSS_UNICODE_RANGE:
     case CSSPrimitiveValue::CSS_UNKNOWN:
     case CSSPrimitiveValue::CSS_URI:
         return false;
     }
 
     ASSERT_NOT_REACHED();
     return false;
 }
 
-CSSPrimitiveValue::UnitTable createUnitTable()
+typedef HashMap<String, CSSPrimitiveValue::UnitTypes> StringToUnitTable;
+
+StringToUnitTable createStringToUnitTable()
 {
-    CSSPrimitiveValue::UnitTable table;
+    StringToUnitTable table;
     table.set(String("em"), CSSPrimitiveValue::CSS_EMS);
     table.set(String("ex"), CSSPrimitiveValue::CSS_EXS);
     table.set(String("px"), CSSPrimitiveValue::CSS_PX);
     table.set(String("cm"), CSSPrimitiveValue::CSS_CM);
     table.set(String("mm"), CSSPrimitiveValue::CSS_MM);
     table.set(String("in"), CSSPrimitiveValue::CSS_IN);
     table.set(String("pt"), CSSPrimitiveValue::CSS_PT);
     table.set(String("pc"), CSSPrimitiveValue::CSS_PC);
     table.set(String("deg"), CSSPrimitiveValue::CSS_DEG);
     table.set(String("rad"), CSSPrimitiveValue::CSS_RAD);
     table.set(String("grad"), CSSPrimitiveValue::CSS_GRAD);
     table.set(String("ms"), CSSPrimitiveValue::CSS_MS);
     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);
     return table;
 }
 
+
 CSSPrimitiveValue::UnitTypes CSSPrimitiveValue::fromName(const String& unit)
 {
-    DEFINE_STATIC_LOCAL(UnitTable, unitTable, (createUnitTable()));
+    DEFINE_STATIC_LOCAL(StringToUnitTable, unitTable, (createStringToUnitTable()));
     return unitTable.get(unit.lower());
 }
 
 CSSPrimitiveValue::UnitCategory CSSPrimitiveValue::unitCategory(CSSPrimitiveValue::UnitTypes type)
 {
     // Here we violate the spec (http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSPrimitiveValue) and allow conversions
     // between CSS_PX and relative lengths (see cssPixelsPerInch comment in core/css/CSSHelper.h for the topic treatment).
     switch (type) {
     case CSS_NUMBER:
         return CSSPrimitiveValue::UNumber;
@@ skipping 893 matching lines @@
 
     return String::adopt(buffer);
 }
 
 template <unsigned characterCount>
 ALWAYS_INLINE static String formatNumber(double number, const char (&characters)[characterCount])
 {
     return formatNumber(number, characters, characterCount - 1);
 }
 
+static String formatNumber(double number, const String & str)
+{
+    return formatNumber(number, str.ascii().data(), str.length());
+}
+
+String CSSPrimitiveValue::unitTypeToString(UnitTypes type)
+{
+    switch (type) {
+    case CSS_NUMBER:
+    case CSS_PARSER_INTEGER:
+        return String("");
+    case CSS_PERCENTAGE:
+        return String("%");
+    case CSS_EMS:
+        return String("em");
+    case CSS_EXS:
+        return String("ex");
+    case CSS_REMS:
+        return String("rem");
+    case CSS_CHS:
+        return String("ch");
+    case CSS_PX:
+        return String("px");
+    case CSS_CM:
+        return String("cm");
+    case CSS_DPPX:
+        return String("dppx");
+    case CSS_DPI:
+        return String("dpi");
+    case CSS_DPCM:
+        return String("dpcm");
+    case CSS_MM:
+        return String("mm");
+    case CSS_IN:
+        return String("in");
+    case CSS_PT:
+        return String("pt");
+    case CSS_PC:
+        return String("pc");
+    case CSS_DEG:
+        return String("deg");
+    case CSS_RAD:
+        return String("rad");
+    case CSS_GRAD:
+        return String("grad");
+    case CSS_MS:
+        return String("ms");
+    case CSS_S:
+        return String("s");
+    case CSS_HZ:
+        return String("hz");
+    case CSS_KHZ:
+        return String("khz");
+    case CSS_TURN:
+        return String("turn");
+    default:

[eseidel, 2014/04/23 16:51:04]

Are you sure you want a default?  That will defeat the compiler warning about
missing cases for the enum.

+        break;
+    };
+    return String();
+}
+
 String CSSPrimitiveValue::customCSSText(CSSTextFormattingFlags formattingFlag) const
 {
     // FIXME: return the original value instead of a generated one (e.g. color
     // name if it was specified) - check what spec says about this
 
     if (m_hasCachedCSSText) {
         ASSERT(cssTextCache().contains(this));
         return cssTextCache().get(this);
     }
 
     String text;
     switch (m_primitiveUnitType) {
         case CSS_UNKNOWN:
             // FIXME
             break;
         case CSS_NUMBER:
         case CSS_PARSER_INTEGER:
-            text = formatNumber(m_value.num, "");
-            break;
         case CSS_PERCENTAGE:
-            text = formatNumber(m_value.num, "%");
-            break;
         case CSS_EMS:
-            text = formatNumber(m_value.num, "em");
-            break;
         case CSS_EXS:
-            text = formatNumber(m_value.num, "ex");
-            break;
         case CSS_REMS:
-            text = formatNumber(m_value.num, "rem");
-            break;
         case CSS_CHS:
-            text = formatNumber(m_value.num, "ch");
-            break;
         case CSS_PX:
-            text = formatNumber(m_value.num, "px");
-            break;
         case CSS_CM:
-            text = formatNumber(m_value.num, "cm");
-            break;
         case CSS_DPPX:
-            text = formatNumber(m_value.num, "dppx");
-            break;
         case CSS_DPI:
-            text = formatNumber(m_value.num, "dpi");
-            break;
         case CSS_DPCM:
-            text = formatNumber(m_value.num, "dpcm");
-            break;
         case CSS_MM:
-            text = formatNumber(m_value.num, "mm");
-            break;
         case CSS_IN:
-            text = formatNumber(m_value.num, "in");
-            break;
         case CSS_PT:
-            text = formatNumber(m_value.num, "pt");
-            break;
         case CSS_PC:
-            text = formatNumber(m_value.num, "pc");
-            break;
         case CSS_DEG:
-            text = formatNumber(m_value.num, "deg");
-            break;
         case CSS_RAD:
-            text = formatNumber(m_value.num, "rad");
-            break;
         case CSS_GRAD:
-            text = formatNumber(m_value.num, "grad");
-            break;
         case CSS_MS:
-            text = formatNumber(m_value.num, "ms");
-            break;
         case CSS_S:
-            text = formatNumber(m_value.num, "s");
-            break;
         case CSS_HZ:
-            text = formatNumber(m_value.num, "hz");
-            break;
         case CSS_KHZ:
-            text = formatNumber(m_value.num, "khz");
-            break;
         case CSS_TURN:
-            text = formatNumber(m_value.num, "turn");
-            break;
+            text = formatNumber(m_value.num, unitTypeToString((UnitTypes)m_primitiveUnitType));
         case CSS_DIMENSION:
             // FIXME: We currently don't handle CSS_DIMENSION properly as we don't store
             // the actual dimension, just the numeric value as a string.
             break;
         case CSS_STRING:
             text = formattingFlag == AlwaysQuoteCSSString ? quoteCSSString(m_value.string) : quoteCSSStringIfNeeded(m_value.string);
             break;
         case CSS_URI:
             text = "url(" + quoteCSSURLIfNeeded(m_value.string) + ")";
             break;
@@ skipping 270 matching lines @@
     case CSS_SHAPE:
         visitor->trace(m_value.shape);
         break;
     default:
         break;
     }
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace WebCore