Index: third_party/WebKit/Source/core/css/cssom/LengthValue.cpp |
diff --git a/third_party/WebKit/Source/core/css/cssom/LengthValue.cpp b/third_party/WebKit/Source/core/css/cssom/LengthValue.cpp |
index d6643239fbeb54084ed0e5a691d74e99092519ce..e3ab3deec657255ad1f2c87fe99d611cb4c3fc68 100644 |
--- a/third_party/WebKit/Source/core/css/cssom/LengthValue.cpp |
+++ b/third_party/WebKit/Source/core/css/cssom/LengthValue.cpp |
@@ -5,6 +5,7 @@ |
#include "core/css/cssom/LengthValue.h" |
#include "bindings/core/v8/ExceptionState.h" |
+#include "core/css/CSSPrimitiveValueUnitTrie.h" |
#include "core/css/cssom/CalcDictionary.h" |
#include "core/css/cssom/SimpleLength.h" |
#include "core/css/cssom/StyleCalcLength.h" |
@@ -17,7 +18,9 @@ CSSPrimitiveValue::UnitType LengthValue::unitFromName(const String& name) |
if (equalIgnoringASCIICase(name, "percent") || name == "%") { |
return CSSPrimitiveValue::UnitType::Percentage; |
} |
- return CSSPrimitiveValue::fromName(name); |
+ if (name.is8Bit()) |
+ return lookupCSSPrimitiveValueUnit(name.characters8(), name.length()); |
+ return lookupCSSPrimitiveValueUnit(name.characters16(), name.length()); |
} |
LengthValue* LengthValue::from(const String& cssString, ExceptionState& exceptionState) |