| Index: third_party/WebKit/Source/core/css/cssom/CSSLengthValue.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/cssom/CSSLengthValue.cpp b/third_party/WebKit/Source/core/css/cssom/CSSLengthValue.cpp
|
| index 7f08b13aa7464a32d6e698418b3b209bd1cb2aee..b84bfeda689b7adf7f06a28ab963ba0994e54839 100644
|
| --- a/third_party/WebKit/Source/core/css/cssom/CSSLengthValue.cpp
|
| +++ b/third_party/WebKit/Source/core/css/cssom/CSSLengthValue.cpp
|
| @@ -5,7 +5,7 @@
|
| #include "core/css/cssom/CSSLengthValue.h"
|
|
|
| #include "bindings/core/v8/ExceptionState.h"
|
| -#include "core/css/CSSPrimitiveValueUnitTrie.h"
|
| +#include "core/css/CSSPrimitiveValue.h"
|
| #include "core/css/cssom/CSSCalcLength.h"
|
| #include "core/css/cssom/CSSSimpleLength.h"
|
| #include "core/css/cssom/CalcDictionary.h"
|
| @@ -15,12 +15,9 @@ namespace blink {
|
|
|
| CSSPrimitiveValue::UnitType CSSLengthValue::unitFromName(const String& name)
|
| {
|
| - if (equalIgnoringASCIICase(name, "percent") || name == "%") {
|
| + if (equalIgnoringASCIICase(name, "percent") || name == "%")
|
| return CSSPrimitiveValue::UnitType::Percentage;
|
| - }
|
| - if (name.is8Bit())
|
| - return lookupCSSPrimitiveValueUnit(name.characters8(), name.length());
|
| - return lookupCSSPrimitiveValueUnit(name.characters16(), name.length());
|
| + return CSSPrimitiveValue::stringToUnitType(name);
|
| }
|
|
|
| CSSLengthValue* CSSLengthValue::from(const String& cssString, ExceptionState& exceptionState)
|
|
|