[css-align] Adapt the place-content shorthand to the new baseline syntax

third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/parser/CSSPropertyParser.h"
 
 #include <memory>
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSBasicShapeValues.h"
 #include "core/css/CSSBorderImage.h"
@@ skipping 3281 matching lines @@
               important);
   addProperty(CSSPropertyGridAutoRows, CSSPropertyGrid, *autoRowsValue,
               important);
   addProperty(CSSPropertyGridColumnGap, CSSPropertyGrid,
               *CSSInitialValue::create(), important);
   addProperty(CSSPropertyGridRowGap, CSSPropertyGrid,
               *CSSInitialValue::create(), important);
   return true;
 }
 
-static CSSValue* consumeSimplifiedContentPosition(CSSParserTokenRange& range) {
-  CSSValueID id = range.peek().id();
-  if (identMatches<CSSValueNormal, CSSValueBaseline, CSSValueLastBaseline>(
-          id)) {
-    return CSSContentDistributionValue::create(
-        CSSValueInvalid, range.consumeIncludingWhitespace().id(),
-        CSSValueInvalid);
-  }
-  if (identMatches<CSSValueSpaceBetween, CSSValueSpaceAround,
-                   CSSValueSpaceEvenly, CSSValueStretch>(id)) {
-    return CSSContentDistributionValue::create(
-        range.consumeIncludingWhitespace().id(), CSSValueInvalid,
-        CSSValueInvalid);
-  }
-  if (identMatches<CSSValueStart, CSSValueEnd, CSSValueCenter,
-                   CSSValueFlexStart, CSSValueFlexEnd, CSSValueLeft,
-                   CSSValueRight>(id)) {
-    return CSSContentDistributionValue::create(
-        CSSValueInvalid, range.consumeIncludingWhitespace().id(),
-        CSSValueInvalid);
-  }
-  return nullptr;
-}
-
 bool CSSPropertyParser::consumePlaceContentShorthand(bool important) {
   DCHECK(RuntimeEnabledFeatures::cssGridLayoutEnabled());
   DCHECK_EQ(shorthandForProperty(CSSPropertyPlaceContent).length(),
             static_cast<unsigned>(2));
 
-  CSSValue* alignContentValue = consumeSimplifiedContentPosition(m_range);
+  CSSValue* alignContentValue =
+      CSSPropertyAlignmentUtils::consumeSimplifiedContentPosition(m_range);
   if (!alignContentValue)
     return false;
   CSSValue* justifyContentValue =
-      m_range.atEnd() ? alignContentValue
-                      : consumeSimplifiedContentPosition(m_range);
+      m_range.atEnd()
+          ? alignContentValue
+          : CSSPropertyAlignmentUtils::consumeSimplifiedContentPosition(
+                m_range);
   if (!justifyContentValue)
     return false;
   if (!m_range.atEnd())
     return false;
 
   addProperty(CSSPropertyAlignContent, CSSPropertyPlaceContent,
               *alignContentValue, important);
   addProperty(CSSPropertyJustifyContent, CSSPropertyPlaceContent,
               *justifyContentValue, important);
   return true;
@@ skipping 259 matching lines @@
     case CSSPropertyGrid:
       return consumeGridShorthand(important);
     case CSSPropertyPlaceContent:
       return consumePlaceContentShorthand(important);
     default:
       return false;
   }
 }
 
 }  // namespace blink