Merge 153078 "Unprefix Flexbox"

Source/core/css/CSSPrimitiveValueMappings.h

 /*
  * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>.
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 1224 matching lines @@
     case TABLE_CAPTION:
         m_value.valueID = CSSValueTableCaption;
         break;
     case BOX:
         m_value.valueID = CSSValueWebkitBox;
         break;
     case INLINE_BOX:
         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;
         break;
     case INLINE_GRID:
         m_value.valueID = CSSValueInlineGrid;
         break;
     case LAZY_BLOCK:
         m_value.valueID = CSSValueLazyBlock;
         break;
     case NONE:
         m_value.valueID = CSSValueNone;
         break;
     }
 }
 
 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;
 }
 
 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCell e)
     : CSSValue(PrimitiveClass)
 {
     m_primitiveUnitType = CSS_VALUE_ID;
     switch (e) {
@@ skipping 3397 matching lines @@
         break;
     }
 
     ASSERT_NOT_REACHED();
     return TouchActionNone;
 }
 
 }
 
 #endif