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 1268 matching lines @@
     case CSS_SHAPE:
         visitor->trace(m_value.shape);
         break;
     default:
         break;
     }
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace WebCore