| Index: Source/core/css/CSSPrimitiveValueMappings.h
|
| diff --git a/Source/core/css/CSSPrimitiveValueMappings.h b/Source/core/css/CSSPrimitiveValueMappings.h
|
| index 352dad25b11e956300b09fb2a04c0d9bb4a9c226..0fc39c253b9f3f0dd8c6af415687979070146b4a 100644
|
| --- a/Source/core/css/CSSPrimitiveValueMappings.h
|
| +++ b/Source/core/css/CSSPrimitiveValueMappings.h
|
| @@ -4706,11 +4706,11 @@ template<> inline CSSPrimitiveValue::operator TouchActionDelay() const
|
| return TouchActionDelayNone;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LayoutBox layoutBox)
|
| +template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CSSBoxType cssBox)
|
| : CSSValue(PrimitiveClass)
|
| {
|
| m_primitiveUnitType = CSS_VALUE_ID;
|
| - switch (layoutBox) {
|
| + switch (cssBox) {
|
| case MarginBox:
|
| m_value.valueID = CSSValueMarginBox;
|
| break;
|
| @@ -4729,7 +4729,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LayoutBox layoutBox)
|
| }
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::operator LayoutBox() const
|
| +template<> inline CSSPrimitiveValue::operator CSSBoxType() const
|
| {
|
| switch (getValueID()) {
|
| case CSSValueMarginBox:
|
|
|