Merge 153078 "Unprefix Flexbox"

Source/core/css/CSSPrimitiveValueMappings.h

Index: Source/core/css/CSSPrimitiveValueMappings.h
===================================================================
--- Source/core/css/CSSPrimitiveValueMappings.h	(revision 153087)
+++ Source/core/css/CSSPrimitiveValueMappings.h	(working copy)
@@ -1242,10 +1242,10 @@
         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 @@
     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;