| Index: Source/core/css/CSSPrimitiveValue.cpp
|
| diff --git a/Source/core/css/CSSPrimitiveValue.cpp b/Source/core/css/CSSPrimitiveValue.cpp
|
| index 3e8650402d00f0b210d388a06343b4215de8ccc1..6b24ee386c838d098363e86fb8eeda568e16ea9b 100644
|
| --- a/Source/core/css/CSSPrimitiveValue.cpp
|
| +++ b/Source/core/css/CSSPrimitiveValue.cpp
|
| @@ -112,9 +112,11 @@ static inline bool isValidCSSUnitTypeForDoubleConversion(CSSPrimitiveValue::Unit
|
| 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);
|
| @@ -140,9 +142,10 @@ CSSPrimitiveValue::UnitTable createUnitTable()
|
| 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());
|
| }
|
|
|
|
|