| 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 461b1b0001aed5559b406c5e5af247e570378fcc..3cf65c8715143e1cc5a780e3a80033211d12228d 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
|
| @@ -1901,25 +1901,25 @@ template <>
|
| inline CSSIdentifierValue::CSSIdentifierValue(EOverflow e)
|
| : CSSValue(IdentifierClass) {
|
| switch (e) {
|
| - case EOverflow::Visible:
|
| + case EOverflow::kVisible:
|
| m_valueID = CSSValueVisible;
|
| break;
|
| - case EOverflow::Hidden:
|
| + case EOverflow::kHidden:
|
| m_valueID = CSSValueHidden;
|
| break;
|
| - case EOverflow::Scroll:
|
| + case EOverflow::kScroll:
|
| m_valueID = CSSValueScroll;
|
| break;
|
| - case EOverflow::Auto:
|
| + case EOverflow::kAuto:
|
| m_valueID = CSSValueAuto;
|
| break;
|
| - case EOverflow::Overlay:
|
| + case EOverflow::kOverlay:
|
| m_valueID = CSSValueOverlay;
|
| break;
|
| - case EOverflow::PagedX:
|
| + case EOverflow::kWebkitPagedX:
|
| m_valueID = CSSValueWebkitPagedX;
|
| break;
|
| - case EOverflow::PagedY:
|
| + case EOverflow::kWebkitPagedY:
|
| m_valueID = CSSValueWebkitPagedY;
|
| break;
|
| }
|
| @@ -1929,25 +1929,25 @@ template <>
|
| inline EOverflow CSSIdentifierValue::convertTo() const {
|
| switch (m_valueID) {
|
| case CSSValueVisible:
|
| - return EOverflow::Visible;
|
| + return EOverflow::kVisible;
|
| case CSSValueHidden:
|
| - return EOverflow::Hidden;
|
| + return EOverflow::kHidden;
|
| case CSSValueScroll:
|
| - return EOverflow::Scroll;
|
| + return EOverflow::kScroll;
|
| case CSSValueAuto:
|
| - return EOverflow::Auto;
|
| + return EOverflow::kAuto;
|
| case CSSValueOverlay:
|
| - return EOverflow::Overlay;
|
| + return EOverflow::kOverlay;
|
| case CSSValueWebkitPagedX:
|
| - return EOverflow::PagedX;
|
| + return EOverflow::kWebkitPagedX;
|
| case CSSValueWebkitPagedY:
|
| - return EOverflow::PagedY;
|
| + return EOverflow::kWebkitPagedY;
|
| default:
|
| break;
|
| }
|
|
|
| ASSERT_NOT_REACHED();
|
| - return EOverflow::Visible;
|
| + return EOverflow::kVisible;
|
| }
|
|
|
| template <>
|
|
|