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

third_party/WebKit/Source/core/css/properties/CSSPropertyAlignmentUtils.cpp

 // Copyright 2017 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/properties/CSSPropertyAlignmentUtils.h"
 
 #include "core/css/CSSContentDistributionValue.h"
 #include "core/css/CSSValuePair.h"
 #include "core/css/parser/CSSPropertyParserHelpers.h"
 
@@ skipping 26 matching lines @@
 bool isOverflowKeyword(CSSValueID id) {
   return CSSPropertyParserHelpers::identMatches<CSSValueUnsafe, CSSValueSafe>(
       id);
 }
 
 bool isBaselineKeyword(CSSValueID id) {
   return CSSPropertyParserHelpers::identMatches<CSSValueFirst, CSSValueLast,
                                                 CSSValueBaseline>(id);
 }
 
+CSSValueID getBaselineKeyword(CSSValue& value) {
+  if (!value.isValuePair()) {
+    DCHECK(toCSSIdentifierValue(value).getValueID() == CSSValueBaseline);
+    return CSSValueBaseline;
+  }
+
+  DCHECK(toCSSIdentifierValue(toCSSValuePair(value).second()).getValueID() ==
+         CSSValueBaseline);
+  if (toCSSIdentifierValue(toCSSValuePair(value).first()).getValueID() ==
+      CSSValueLast) {
+    return CSSValueLastBaseline;
+  }
+  DCHECK(toCSSIdentifierValue(toCSSValuePair(value).first()).getValueID() ==
+         CSSValueFirst);
+  return CSSValueFirstBaseline;
+}
+
 CSSValue* consumeBaselineKeyword(CSSParserTokenRange& range) {
   CSSValueID id = range.peek().id();
   if (CSSPropertyParserHelpers::identMatches<CSSValueBaseline>(id))
     return CSSPropertyParserHelpers::consumeIdent(range);
 
   if (CSSIdentifierValue* preference =
           CSSPropertyParserHelpers::consumeIdent<CSSValueFirst, CSSValueLast>(
               range)) {
     if (range.peek().id() == CSSValueBaseline) {
       return CSSValuePair::create(preference,
@@ skipping 40 matching lines @@
   if (CSSPropertyParserHelpers::identMatches<CSSValueNormal>(id)) {
     return CSSContentDistributionValue::create(
         CSSValueInvalid, range.consumeIncludingWhitespace().id(),
         CSSValueInvalid);
   }
 
   if (isBaselineKeyword(id)) {
     CSSValue* baseline = consumeBaselineKeyword(range);
     if (!baseline)
       return nullptr;
-    CSSValueID baselineID = CSSValueBaseline;
-    if (baseline->isValuePair()) {
-      if (toCSSIdentifierValue(toCSSValuePair(baseline)->first())
-              .getValueID() == CSSValueLast) {
-        baselineID = CSSValueLastBaseline;
-      } else {
-        baselineID = CSSValueFirstBaseline;
-      }
-    }
-    return CSSContentDistributionValue::create(CSSValueInvalid, baselineID,
-                                               CSSValueInvalid);
+    return CSSContentDistributionValue::create(
+        CSSValueInvalid, getBaselineKeyword(*baseline), CSSValueInvalid);
   }
 
   CSSValueID distribution = CSSValueInvalid;
   CSSValueID position = CSSValueInvalid;
   CSSValueID overflow = CSSValueInvalid;
   do {
     if (isContentDistributionKeyword(id)) {
       if (distribution != CSSValueInvalid)
         return nullptr;
       distribution = id;
@@ skipping 18 matching lines @@
     return nullptr;
 
   // The grammar states that <overflow-position> must be associated to
   // <content-position>.
   if (overflow != CSSValueInvalid && position == CSSValueInvalid)
     return nullptr;
 
   return CSSContentDistributionValue::create(distribution, position, overflow);
 }
 
+CSSValue* CSSPropertyAlignmentUtils::consumeSimplifiedContentPosition(
+    CSSParserTokenRange& range) {
+  CSSValueID id = range.peek().id();
+  if (CSSPropertyParserHelpers::identMatches<CSSValueNormal>(id) ||

[Bugs Nash, 2017/03/29 21:52:11]

Didn't you say you were going to keep CSSValueLastBaseline here? Or did I
misunderstand your last comment?

[jfernandez, 2017/03/29 22:03:51]

Probably I didn't explain it properly. I thought you were suggesting that since
CSSValueLastBaseline was handled by isBaselineKeyword we
could remove the keyword itself. My answer was that I do want to keep the
keyword, as it will be used for generating the computed style value. The spec
doesn't allow "last-baseline"  now, and it specifies "last baseline" instead;
however, we still need the old 
CSSValueLastBaseline for other purposes.

We don't need to use it in the identMatches clause above, though. The allowed
baseline syntax for CSS parsing is handled below by isBaselineKeyword.

+      isContentPositionKeyword(id)) {
+    return CSSContentDistributionValue::create(
+        CSSValueInvalid, range.consumeIncludingWhitespace().id(),
+        CSSValueInvalid);
+  }
+
+  if (isBaselineKeyword(id)) {
+    CSSValue* baseline = consumeBaselineKeyword(range);
+    if (!baseline)
+      return nullptr;
+    return CSSContentDistributionValue::create(
+        CSSValueInvalid, getBaselineKeyword(*baseline), CSSValueInvalid);
+  }
+
+  if (isContentDistributionKeyword(id)) {
+    return CSSContentDistributionValue::create(
+        range.consumeIncludingWhitespace().id(), CSSValueInvalid,
+        CSSValueInvalid);
+  }
+  return nullptr;
+}
+
 }  // namespace blink