Merge 153078 "Unprefix Flexbox"

Source/core/css/StylePropertyShorthand.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 351 matching lines @@
 {
     static const CSSPropertyID columnRuleProperties[] = {
         CSSPropertyWebkitColumnRuleWidth,
         CSSPropertyWebkitColumnRuleStyle,
         CSSPropertyWebkitColumnRuleColor,
     };
     DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitColumnRuleLonghands, (CSSPropertyWebkitColumnRule, columnRuleProperties, WTF_ARRAY_LENGTH(columnRuleProperties)));
     return webkitColumnRuleLonghands;
 }
 
-const StylePropertyShorthand& webkitFlexFlowShorthand()
+const StylePropertyShorthand& flexFlowShorthand()
 {
-    static const CSSPropertyID flexFlowProperties[] = { CSSPropertyWebkitFlexDirection, CSSPropertyWebkitFlexWrap };
-    DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitFlexFlowLonghands, (CSSPropertyWebkitFlexFlow, flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties)));
-    return webkitFlexFlowLonghands;
+    static const CSSPropertyID flexFlowProperties[] = { CSSPropertyFlexDirection, CSSPropertyFlexWrap };
+    DEFINE_STATIC_LOCAL(StylePropertyShorthand, flexFlowLonghands, (CSSPropertyFlexFlow, flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties)));
+    return flexFlowLonghands;
 }
 
-const StylePropertyShorthand& webkitFlexShorthand()
+const StylePropertyShorthand& flexShorthand()
 {
-    static const CSSPropertyID flexProperties[] = { CSSPropertyWebkitFlexGrow, CSSPropertyWebkitFlexShrink, CSSPropertyWebkitFlexBasis };
-    DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitFlexLonghands, (CSSPropertyWebkitFlex, flexProperties, WTF_ARRAY_LENGTH(flexProperties)));
-    return webkitFlexLonghands;
+    static const CSSPropertyID flexProperties[] = { CSSPropertyFlexGrow, CSSPropertyFlexShrink, CSSPropertyFlexBasis };
+    DEFINE_STATIC_LOCAL(StylePropertyShorthand, flexLonghands, (CSSPropertyFlex, flexProperties, WTF_ARRAY_LENGTH(flexProperties)));
+    return flexLonghands;
 }
 
 const StylePropertyShorthand& webkitMarginCollapseShorthand()
 {
     static const CSSPropertyID marginCollapseProperties[] = { CSSPropertyWebkitMarginBeforeCollapse, CSSPropertyWebkitMarginAfterCollapse };
     DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitMarginCollapseLonghands, (CSSPropertyWebkitMarginCollapse, marginCollapseProperties, WTF_ARRAY_LENGTH(marginCollapseProperties)));
     return webkitMarginCollapseLonghands;
 }
 
 const StylePropertyShorthand& gridColumnShorthand()
@@ skipping 186 matching lines @@
     case CSSPropertyWebkitBorderEnd:
         return webkitBorderEndShorthand();
     case CSSPropertyWebkitBorderStart:
         return webkitBorderStartShorthand();
     case CSSPropertyWebkitBorderRadius:
         return borderRadiusShorthand();
     case CSSPropertyWebkitColumns:
         return webkitColumnsShorthand();
     case CSSPropertyWebkitColumnRule:
         return webkitColumnRuleShorthand();
-    case CSSPropertyWebkitFlex:
-        return webkitFlexShorthand();
-    case CSSPropertyWebkitFlexFlow:
-        return webkitFlexFlowShorthand();
+    case CSSPropertyFlex:
+        return flexShorthand();
+    case CSSPropertyFlexFlow:
+        return flexFlowShorthand();
     case CSSPropertyGridColumn:
         return gridColumnShorthand();
     case CSSPropertyGridRow:
         return gridRowShorthand();
     case CSSPropertyGridArea:
         return gridAreaShorthand();
     case CSSPropertyWebkitMarginCollapse:
         return webkitMarginCollapseShorthand();
     case CSSPropertyWebkitMarquee:
         return webkitMarqueeShorthand();
@@ skipping 242 matching lines @@
         map.set(CSSPropertyWebkitColumnWidth, columns);
         map.set(CSSPropertyWebkitColumnCount, columns);
 
         Vector<StylePropertyShorthand, 1> columnRule;
         columnRule.uncheckedAppend(webkitColumnRuleShorthand());
         map.set(CSSPropertyWebkitColumnRuleWidth, columnRule);
         map.set(CSSPropertyWebkitColumnRuleStyle, columnRule);
         map.set(CSSPropertyWebkitColumnRuleColor, columnRule);
 
         Vector<StylePropertyShorthand, 1> flex;
-        flex.uncheckedAppend(webkitFlexShorthand());
-        map.set(CSSPropertyWebkitFlexGrow, flex);
-        map.set(CSSPropertyWebkitFlexShrink, flex);
-        map.set(CSSPropertyWebkitFlexBasis, flex);
+        flex.uncheckedAppend(flexShorthand());
+        map.set(CSSPropertyFlexGrow, flex);
+        map.set(CSSPropertyFlexShrink, flex);
+        map.set(CSSPropertyFlexBasis, flex);
 
         Vector<StylePropertyShorthand, 1> flexFlow;
-        flexFlow.uncheckedAppend(webkitFlexFlowShorthand());
-        map.set(CSSPropertyWebkitFlexDirection, flexFlow);
-        map.set(CSSPropertyWebkitFlexWrap, flexFlow);
+        flexFlow.uncheckedAppend(flexFlowShorthand());
+        map.set(CSSPropertyFlexDirection, flexFlow);
+        map.set(CSSPropertyFlexWrap, flexFlow);
 
         Vector<StylePropertyShorthand, 2> grid;
         grid.uncheckedAppend(gridAreaShorthand());
         grid.uncheckedAppend(gridColumnShorthand());
         map.set(CSSPropertyGridStart, grid);
         map.set(CSSPropertyGridEnd, grid);
 
         Vector<StylePropertyShorthand, 2> gridAfter;
         gridAfter.uncheckedAppend(gridAreaShorthand());
         gridAfter.uncheckedAppend(gridRowShorthand());
@@ skipping 70 matching lines @@
 {
     for (unsigned i = 0; i < shorthands.size(); ++i) {
         if (shorthands.at(i).id() == shorthandID)
             return i;
     }
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 } // namespace WebCore