| Index: third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
|
| diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
|
| index f1937e04064d5d8a61647cb6cb771eac5d4eff80..838086cfea0dcb0a5bb8dee62eaad7e4b66904d1 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
|
| @@ -1369,13 +1369,13 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFloat e)
|
| {
|
| init(UnitType::ValueID);
|
| switch (e) {
|
| - case EFloat::NoFloat:
|
| + case EFloat::None:
|
| m_value.valueID = CSSValueNone;
|
| break;
|
| - case EFloat::LeftFloat:
|
| + case EFloat::Left:
|
| m_value.valueID = CSSValueLeft;
|
| break;
|
| - case EFloat::RightFloat:
|
| + case EFloat::Right:
|
| m_value.valueID = CSSValueRight;
|
| break;
|
| }
|
| @@ -1386,17 +1386,17 @@ template<> inline EFloat CSSPrimitiveValue::convertTo() const
|
| ASSERT(isValueID());
|
| switch (m_value.valueID) {
|
| case CSSValueLeft:
|
| - return EFloat::LeftFloat;
|
| + return EFloat::Left;
|
| case CSSValueRight:
|
| - return EFloat::RightFloat;
|
| + return EFloat::Right;
|
| case CSSValueNone:
|
| - return EFloat::NoFloat;
|
| + return EFloat::None;
|
| default:
|
| break;
|
| }
|
|
|
| ASSERT_NOT_REACHED();
|
| - return EFloat::NoFloat;
|
| + return EFloat::None;
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::CSSPrimitiveValue(Hyphens e)
|
|
|