| Index: Source/core/css/CSSPrimitiveValueMappings.h
|
| diff --git a/Source/core/css/CSSPrimitiveValueMappings.h b/Source/core/css/CSSPrimitiveValueMappings.h
|
| index 28ff5672d15adf3897d294077f98de86d91cdcf6..d9a01fb38e63e2d08cce1caf8411da4f67e5d99b 100644
|
| --- a/Source/core/css/CSSPrimitiveValueMappings.h
|
| +++ b/Source/core/css/CSSPrimitiveValueMappings.h
|
| @@ -1242,10 +1242,10 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e)
|
| m_value.valueID = CSSValueWebkitInlineBox;
|
| break;
|
| case FLEX:
|
| - m_value.valueID = CSSValueWebkitFlex;
|
| + m_value.valueID = CSSValueFlex;
|
| break;
|
| case INLINE_FLEX:
|
| - m_value.valueID = CSSValueWebkitInlineFlex;
|
| + m_value.valueID = CSSValueInlineFlex;
|
| break;
|
| case GRID:
|
| m_value.valueID = CSSValueGrid;
|
| @@ -1267,6 +1267,11 @@ template<> inline CSSPrimitiveValue::operator EDisplay() const
|
| if (m_value.valueID == CSSValueNone)
|
| return NONE;
|
|
|
| + if (m_value.valueID == CSSValueWebkitFlex)
|
| + return FLEX;
|
| + if (m_value.valueID == CSSValueWebkitInlineFlex)
|
| + return INLINE_FLEX;
|
| +
|
| EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline);
|
| ASSERT(display >= INLINE && display <= NONE);
|
| return display;
|
|
|