Move style building for grid-auto-flow to StyleBuilderConverter.

There doesn't appear to be a reason for this property to have
custom behavior. It's better to use a converter and call that
from the generated function.

Review URL: https://codereview.chromium.org/642303002

git-svn-id: svn://svn.chromium.org/blink/trunk@183595 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/css/CSSProperties.in

@@ -176,7 +176,7 @@ flood-opacity animatable, svg, converter=convertNumberOrPercentage
 glyph-orientation-horizontal inherited, svg, converter=convertGlyphOrientation
 glyph-orientation-vertical inherited, svg, custom_value
 grid-auto-columns runtime_flag=CSSGridLayout, converter=convertGridTrackSize
-grid-auto-flow runtime_flag=CSSGridLayout, custom_value
+grid-auto-flow runtime_flag=CSSGridLayout, converter=convertGridAutoFlow
 grid-auto-rows runtime_flag=CSSGridLayout, converter=convertGridTrackSize
 grid-column-end runtime_flag=CSSGridLayout, converter=convertGridPosition
 grid-column-start runtime_flag=CSSGridLayout, converter=convertGridPosition

third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

@@ -338,6 +338,43 @@ EGlyphOrientation StyleBuilderConverter::convertGlyphOrientation(StyleResolverSt
     return GO_270DEG;
 }
 
+GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(StyleResolverState&, CSSValue* value)
+{
+    CSSValueList* list = toCSSValueList(value);
+
+    ASSERT(list->length() >= 1);
+    CSSPrimitiveValue* first = toCSSPrimitiveValue(list->item(0));
+    CSSPrimitiveValue* second = list->length() == 2 ? toCSSPrimitiveValue(list->item(1)) : nullptr;
+
+    switch (first->getValueID()) {
+    case CSSValueRow:
+        if (second) {
+            if (second->getValueID() == CSSValueDense)
+                return AutoFlowRowDense;
+            return AutoFlowStackRow;
+        }
+        return AutoFlowRow;
+    case CSSValueColumn:
+        if (second) {
+            if (second->getValueID() == CSSValueDense)
+                return AutoFlowColumnDense;
+            return AutoFlowStackColumn;
+        }
+        return AutoFlowColumn;
+    case CSSValueDense:
+        if (second && second->getValueID() == CSSValueColumn)
+            return AutoFlowColumnDense;
+        return AutoFlowRowDense;
+    case CSSValueStack:
+        if (second && second->getValueID() == CSSValueColumn)
+            return AutoFlowStackColumn;
+        return AutoFlowStackRow;
+    default:
+        ASSERT_NOT_REACHED();
+        return RenderStyle::initialGridAutoFlow();
+    }
+}
+
 GridPosition StyleBuilderConverter::convertGridPosition(StyleResolverState&, CSSValue* value)
 {
     // We accept the specification's grammar:

third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h

@@ -55,6 +55,7 @@ public:
     static FontWeight convertFontWeight(StyleResolverState&, CSSValue*);
     static FontDescription::VariantLigatures convertFontVariantLigatures(StyleResolverState&, CSSValue*);
     static EGlyphOrientation convertGlyphOrientation(StyleResolverState&, CSSValue*);
+    static GridAutoFlow convertGridAutoFlow(StyleResolverState&, CSSValue*);
     static GridPosition convertGridPosition(StyleResolverState&, CSSValue*);
     static GridTrackSize convertGridTrackSize(StyleResolverState&, CSSValue*);
     template <typename T> static T convertLineWidth(StyleResolverState&, CSSValue*);

third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp

@@ -1130,60 +1130,4 @@ void StyleBuilderFunctions::applyValueCSSPropertyBaselineShift(StyleResolverStat
     }
 }
 
-void StyleBuilderFunctions::applyValueCSSPropertyGridAutoFlow(StyleResolverState& state, CSSValue* value)
-{
-    ASSERT(value->isValueList());
-    CSSValueList* list = toCSSValueList(value);
-
-    CSSPrimitiveValue* first = list->length() >= 1 ? toCSSPrimitiveValue(list->item(0)) : nullptr;
-
-    if (!first) {
-        applyInitialCSSPropertyGridAutoFlow(state);
-        return;
-    }
-
-    CSSPrimitiveValue* second = list->length() == 2 ? toCSSPrimitiveValue(list->item(1)) : nullptr;
-
-    GridAutoFlow autoFlow = RenderStyle::initialGridAutoFlow();
-    switch (first->getValueID()) {
-    case CSSValueRow:
-        if (second) {
-            if (second->getValueID() == CSSValueDense)
-                autoFlow = AutoFlowRowDense;
-            else
-                autoFlow = AutoFlowStackRow;
-        } else {
-            autoFlow = AutoFlowRow;
-        }
-        break;
-    case CSSValueColumn:
-        if (second) {
-            if (second->getValueID() == CSSValueDense)
-                autoFlow = AutoFlowColumnDense;
-            else
-                autoFlow = AutoFlowStackColumn;
-        } else {
-            autoFlow = AutoFlowColumn;
-        }
-        break;
-    case CSSValueDense:
-        if (second && second->getValueID() == CSSValueColumn)
-            autoFlow = AutoFlowColumnDense;
-        else
-            autoFlow = AutoFlowRowDense;
-        break;
-    case CSSValueStack:
-        if (second && second->getValueID() == CSSValueColumn)
-            autoFlow = AutoFlowStackColumn;
-        else
-            autoFlow = AutoFlowStackRow;
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-        break;
-    }
-
-    state.style()->setGridAutoFlow(autoFlow);
-}
-
 } // namespace blink