Implement parseShorthand API for shorthand properties, "overflow", "font" and "font-variant"

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/CSSContentDistributionValue.h"
 #include "core/css/CSSCursorImageValue.h"
 #include "core/css/CSSCustomIdentValue.h"
 #include "core/css/CSSFontFaceSrcValue.h"
-#include "core/css/CSSFontFamilyValue.h"
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSGridAutoRepeatValue.h"
 #include "core/css/CSSGridLineNamesValue.h"
 #include "core/css/CSSGridTemplateAreasValue.h"
 #include "core/css/CSSIdentifierValue.h"
 #include "core/css/CSSInheritedValue.h"
 #include "core/css/CSSInitialValue.h"
 #include "core/css/CSSPendingSubstitutionValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSReflectValue.h"
 #include "core/css/CSSShadowValue.h"
 #include "core/css/CSSStringValue.h"
 #include "core/css/CSSTimingFunctionValue.h"
 #include "core/css/CSSURIValue.h"
 #include "core/css/CSSUnicodeRangeValue.h"
 #include "core/css/CSSUnsetValue.h"
 #include "core/css/CSSValuePair.h"
 #include "core/css/CSSVariableReferenceValue.h"
 #include "core/css/HashTools.h"
 #include "core/css/parser/CSSParserFastPaths.h"
 #include "core/css/parser/CSSParserIdioms.h"
 #include "core/css/parser/CSSParserLocalContext.h"
 #include "core/css/parser/CSSPropertyParserHelpers.h"
 #include "core/css/parser/CSSVariableParser.h"
-#include "core/css/parser/FontVariantLigaturesParser.h"
-#include "core/css/parser/FontVariantNumericParser.h"
 #include "core/css/properties/CSSPropertyAPIOffsetAnchor.h"
 #include "core/css/properties/CSSPropertyAPIOffsetPosition.h"
 #include "core/css/properties/CSSPropertyAlignmentUtils.h"
 #include "core/css/properties/CSSPropertyAnimationNameUtils.h"
 #include "core/css/properties/CSSPropertyBorderImageUtils.h"
 #include "core/css/properties/CSSPropertyColumnUtils.h"
 #include "core/css/properties/CSSPropertyDescriptor.h"
 #include "core/css/properties/CSSPropertyFontUtils.h"
 #include "core/css/properties/CSSPropertyLengthUtils.h"
 #include "core/css/properties/CSSPropertyMarginUtils.h"
@@ skipping 13 matching lines @@
     const CSSParserContext* context,
     HeapVector<CSSProperty, 256>* parsed_properties)
     : range_(range), context_(context), parsed_properties_(parsed_properties) {
   range_.ConsumeWhitespace();
 }
 
 void CSSPropertyParser::AddParsedProperty(CSSPropertyID resolved_property,
                                           CSSPropertyID current_shorthand,
                                           const CSSValue& value,
                                           bool important,
                                           bool implicit) {

[Bugs Nash, 2017/06/19 23:30:12]

just for documentation I want to note that this bool here is not being changed
because this method will be removed soon

[Jia, 2017/06/20 01:05:51]

Done.

-  AddProperty(resolved_property, current_shorthand, value, important, implicit,
-              *parsed_properties_);
+  AddProperty(resolved_property, current_shorthand, value, important,
+              implicit ? kImplicit : kNotImplicit, *parsed_properties_);
 }
 
 void CSSPropertyParser::AddExpandedPropertyForValue(CSSPropertyID property,
                                                     const CSSValue& value,
                                                     bool important) {
   const StylePropertyShorthand& shorthand = shorthandForProperty(property);
   unsigned shorthand_length = shorthand.length();
   DCHECK(shorthand_length);
   const CSSPropertyID* longhands = shorthand.properties();
   for (unsigned i = 0; i < shorthand_length; ++i)
@@ skipping 184 matching lines @@
     if (!CSSPropertyMetadata::IsProperty(unresolved_property))
       return false;
     AddParsedProperty(property, CSSPropertyInvalid, *value, important);
   } else {
     AddExpandedPropertyForValue(property, *value, important);
   }
   range_ = range_copy;
   return true;
 }
 
-static CSSIdentifierValue* ConsumeFontVariantCSS21(CSSParserTokenRange& range) {
-  return ConsumeIdent<CSSValueNormal, CSSValueSmallCaps>(range);
-}
-
 static CSSValue* ConsumeFontVariantList(CSSParserTokenRange& range) {
   CSSValueList* values = CSSValueList::CreateCommaSeparated();
   do {
     if (range.Peek().Id() == CSSValueAll) {
       // FIXME: CSSPropertyParser::ParseFontVariant() implements
       // the old css3 draft:
       // http://www.w3.org/TR/2002/WD-css3-webfonts-20020802/#font-variant
       // 'all' is only allowed in @font-face and with no other values.
       if (values->length())
         return nullptr;
       return ConsumeIdent(range);
     }
-    CSSIdentifierValue* font_variant = ConsumeFontVariantCSS21(range);
+    CSSIdentifierValue* font_variant =
+        CSSPropertyFontUtils::ConsumeFontVariantCSS21(range);
     if (font_variant)
       values->Append(*font_variant);
   } while (ConsumeCommaIncludingWhitespace(range));
 
   if (values->length())
     return values;
 
   return nullptr;
 }
 
@@ skipping 1512 matching lines @@
       break;
   }
 
   if (!parsed_value || !range_.AtEnd())
     return false;
 
   AddParsedProperty(prop_id, CSSPropertyInvalid, *parsed_value, false);
   return true;
 }
 
-bool CSSPropertyParser::ConsumeSystemFont(bool important) {
-  CSSValueID system_font_id = range_.ConsumeIncludingWhitespace().Id();
-  DCHECK_GE(system_font_id, CSSValueCaption);
-  DCHECK_LE(system_font_id, CSSValueStatusBar);
-  if (!range_.AtEnd())
-    return false;
-
-  FontStyle font_style = kFontStyleNormal;
-  FontWeight font_weight = kFontWeightNormal;
-  float font_size = 0;
-  AtomicString font_family;
-  LayoutTheme::GetTheme().SystemFont(system_font_id, font_style, font_weight,
-                                     font_size, font_family);
-
-  AddParsedProperty(CSSPropertyFontStyle, CSSPropertyFont,
-                    *CSSIdentifierValue::Create(font_style == kFontStyleItalic
-                                                    ? CSSValueItalic
-                                                    : CSSValueNormal),
-                    important);
-  AddParsedProperty(CSSPropertyFontWeight, CSSPropertyFont,
-                    *CSSIdentifierValue::Create(font_weight), important);
-  AddParsedProperty(CSSPropertyFontSize, CSSPropertyFont,
-                    *CSSPrimitiveValue::Create(
-                        font_size, CSSPrimitiveValue::UnitType::kPixels),
-                    important);
-  CSSValueList* font_family_list = CSSValueList::CreateCommaSeparated();
-  font_family_list->Append(*CSSFontFamilyValue::Create(font_family));
-  AddParsedProperty(CSSPropertyFontFamily, CSSPropertyFont, *font_family_list,
-                    important);
-
-  AddParsedProperty(CSSPropertyFontStretch, CSSPropertyFont,
-                    *CSSIdentifierValue::Create(CSSValueNormal), important);
-  AddParsedProperty(CSSPropertyFontVariantCaps, CSSPropertyFont,
-                    *CSSIdentifierValue::Create(CSSValueNormal), important);
-  AddParsedProperty(CSSPropertyFontVariantLigatures, CSSPropertyFont,
-                    *CSSIdentifierValue::Create(CSSValueNormal), important);
-  AddParsedProperty(CSSPropertyFontVariantNumeric, CSSPropertyFont,
-                    *CSSIdentifierValue::Create(CSSValueNormal), important);
-  AddParsedProperty(CSSPropertyLineHeight, CSSPropertyFont,
-                    *CSSIdentifierValue::Create(CSSValueNormal), important);
-  return true;
-}
-
-bool CSSPropertyParser::ConsumeFont(bool important) {
-  // Let's check if there is an inherit or initial somewhere in the shorthand.
-  CSSParserTokenRange range = range_;
-  while (!range.AtEnd()) {
-    CSSValueID id = range.ConsumeIncludingWhitespace().Id();
-    if (id == CSSValueInherit || id == CSSValueInitial)
-      return false;
-  }
-  // Optional font-style, font-variant, font-stretch and font-weight.
-  CSSIdentifierValue* font_style = nullptr;
-  CSSIdentifierValue* font_variant_caps = nullptr;
-  CSSIdentifierValue* font_weight = nullptr;
-  CSSIdentifierValue* font_stretch = nullptr;
-  while (!range_.AtEnd()) {
-    CSSValueID id = range_.Peek().Id();
-    if (!font_style && CSSParserFastPaths::IsValidKeywordPropertyAndValue(
-                           CSSPropertyFontStyle, id, context_->Mode())) {
-      font_style = ConsumeIdent(range_);
-      continue;
-    }
-    if (!font_variant_caps &&
-        (id == CSSValueNormal || id == CSSValueSmallCaps)) {
-      // Font variant in the shorthand is particular, it only accepts normal or
-      // small-caps.
-      // See https://drafts.csswg.org/css-fonts/#propdef-font
-      font_variant_caps = ConsumeFontVariantCSS21(range_);
-      if (font_variant_caps)
-        continue;
-    }
-    if (!font_weight) {
-      font_weight = CSSPropertyFontUtils::ConsumeFontWeight(range_);
-      if (font_weight)
-        continue;
-    }
-    if (!font_stretch && CSSParserFastPaths::IsValidKeywordPropertyAndValue(
-                             CSSPropertyFontStretch, id, context_->Mode()))
-      font_stretch = ConsumeIdent(range_);
-    else
-      break;
-  }
-
-  if (range_.AtEnd())
-    return false;
-
-  AddParsedProperty(
-      CSSPropertyFontStyle, CSSPropertyFont,
-      font_style ? *font_style : *CSSIdentifierValue::Create(CSSValueNormal),
-      important);
-  AddParsedProperty(CSSPropertyFontVariantCaps, CSSPropertyFont,
-                    font_variant_caps
-                        ? *font_variant_caps
-                        : *CSSIdentifierValue::Create(CSSValueNormal),
-                    important);
-  AddParsedProperty(CSSPropertyFontVariantLigatures, CSSPropertyFont,
-                    *CSSIdentifierValue::Create(CSSValueNormal), important);
-  AddParsedProperty(CSSPropertyFontVariantNumeric, CSSPropertyFont,
-                    *CSSIdentifierValue::Create(CSSValueNormal), important);
-
-  AddParsedProperty(
-      CSSPropertyFontWeight, CSSPropertyFont,
-      font_weight ? *font_weight : *CSSIdentifierValue::Create(CSSValueNormal),
-      important);
-  AddParsedProperty(CSSPropertyFontStretch, CSSPropertyFont,
-                    font_stretch ? *font_stretch
-                                 : *CSSIdentifierValue::Create(CSSValueNormal),
-                    important);
-
-  // Now a font size _must_ come.
-  CSSValue* font_size =
-      CSSPropertyFontUtils::ConsumeFontSize(range_, context_->Mode());
-  if (!font_size || range_.AtEnd())
-    return false;
-
-  AddParsedProperty(CSSPropertyFontSize, CSSPropertyFont, *font_size,
-                    important);
-
-  if (ConsumeSlashIncludingWhitespace(range_)) {
-    CSSValue* line_height =
-        CSSPropertyFontUtils::ConsumeLineHeight(range_, context_->Mode());
-    if (!line_height)
-      return false;
-    AddParsedProperty(CSSPropertyLineHeight, CSSPropertyFont, *line_height,
-                      important);
-  } else {
-    AddParsedProperty(CSSPropertyLineHeight, CSSPropertyFont,
-                      *CSSIdentifierValue::Create(CSSValueNormal), important);
-  }
-
-  // Font family must come now.
-  CSSValue* parsed_family_value =
-      CSSPropertyFontUtils::ConsumeFontFamily(range_);
-  if (!parsed_family_value)
-    return false;
-
-  AddParsedProperty(CSSPropertyFontFamily, CSSPropertyFont,
-                    *parsed_family_value, important);
-
-  // FIXME: http://www.w3.org/TR/2011/WD-css3-fonts-20110324/#font-prop requires
-  // that "font-stretch", "font-size-adjust", and "font-kerning" be reset to
-  // their initial values but we don't seem to support them at the moment. They
-  // should also be added here once implemented.
-  return range_.AtEnd();
-}
-
-bool CSSPropertyParser::ConsumeFontVariantShorthand(bool important) {
-  if (IdentMatches<CSSValueNormal, CSSValueNone>(range_.Peek().Id())) {
-    AddParsedProperty(CSSPropertyFontVariantLigatures, CSSPropertyFontVariant,
-                      *ConsumeIdent(range_), important);
-    AddParsedProperty(CSSPropertyFontVariantCaps, CSSPropertyFontVariant,
-                      *CSSIdentifierValue::Create(CSSValueNormal), important);
-    return range_.AtEnd();
-  }
-
-  CSSIdentifierValue* caps_value = nullptr;
-  FontVariantLigaturesParser ligatures_parser;
-  FontVariantNumericParser numeric_parser;
-  do {
-    FontVariantLigaturesParser::ParseResult ligatures_parse_result =
-        ligatures_parser.ConsumeLigature(range_);
-    FontVariantNumericParser::ParseResult numeric_parse_result =
-        numeric_parser.ConsumeNumeric(range_);
-    if (ligatures_parse_result ==
-            FontVariantLigaturesParser::ParseResult::kConsumedValue ||
-        numeric_parse_result ==
-            FontVariantNumericParser::ParseResult::kConsumedValue)
-      continue;
-
-    if (ligatures_parse_result ==
-            FontVariantLigaturesParser::ParseResult::kDisallowedValue ||
-        numeric_parse_result ==
-            FontVariantNumericParser::ParseResult::kDisallowedValue)
-      return false;
-
-    CSSValueID id = range_.Peek().Id();
-    switch (id) {
-      case CSSValueSmallCaps:
-      case CSSValueAllSmallCaps:
-      case CSSValuePetiteCaps:
-      case CSSValueAllPetiteCaps:
-      case CSSValueUnicase:
-      case CSSValueTitlingCaps:
-        // Only one caps value permitted in font-variant grammar.
-        if (caps_value)
-          return false;
-        caps_value = ConsumeIdent(range_);
-        break;
-      default:
-        return false;
-    }
-  } while (!range_.AtEnd());
-
-  AddParsedProperty(CSSPropertyFontVariantLigatures, CSSPropertyFontVariant,
-                    *ligatures_parser.FinalizeValue(), important);
-  AddParsedProperty(CSSPropertyFontVariantNumeric, CSSPropertyFontVariant,
-                    *numeric_parser.FinalizeValue(), important);
-  AddParsedProperty(
-      CSSPropertyFontVariantCaps, CSSPropertyFontVariant,
-      caps_value ? *caps_value : *CSSIdentifierValue::Create(CSSValueNormal),
-      important);
-  return true;
-}
-
 bool CSSPropertyParser::ConsumeBorderSpacing(bool important) {
   CSSValue* horizontal_spacing = ConsumeLength(
       range_, context_->Mode(), kValueRangeNonNegative, UnitlessQuirk::kAllow);
   if (!horizontal_spacing)
     return false;
   CSSValue* vertical_spacing = horizontal_spacing;
   if (!range_.AtEnd()) {
     vertical_spacing =
         ConsumeLength(range_, context_->Mode(), kValueRangeNonNegative,
                       UnitlessQuirk::kAllow);
@@ skipping 1015 matching lines @@
   const CSSPropertyDescriptor& css_property_desc =
       CSSPropertyDescriptor::Get(property);
   if (css_property_desc.parseShorthand) {
     return css_property_desc.parseShorthand(
         important, range_, *context_,
         CSSParserLocalContext(isPropertyAlias(unresolved_property)),
         *parsed_properties_);
   }
 
   switch (property) {
-    case CSSPropertyOverflow: {
-      CSSValueID id = range_.ConsumeIncludingWhitespace().Id();
-      if (!CSSParserFastPaths::IsValidKeywordPropertyAndValue(
-              CSSPropertyOverflowY, id, context_->Mode()))
-        return false;
-      if (!range_.AtEnd())
-        return false;
-      CSSValue* overflow_y_value = CSSIdentifierValue::Create(id);
-
-      CSSValue* overflow_x_value = nullptr;
-
-      // FIXME: -webkit-paged-x or -webkit-paged-y only apply to overflow-y.
-      // If
-      // this value has been set using the shorthand, then for now overflow-x
-      // will default to auto, but once we implement pagination controls, it
-      // should default to hidden. If the overflow-y value is anything but
-      // paged-x or paged-y, then overflow-x and overflow-y should have the
-      // same
-      // value.
-      if (id == CSSValueWebkitPagedX || id == CSSValueWebkitPagedY)
-        overflow_x_value = CSSIdentifierValue::Create(CSSValueAuto);
-      else
-        overflow_x_value = overflow_y_value;
-      AddParsedProperty(CSSPropertyOverflowX, CSSPropertyOverflow,
-                        *overflow_x_value, important);
-      AddParsedProperty(CSSPropertyOverflowY, CSSPropertyOverflow,
-                        *overflow_y_value, important);
-      return true;
-    }
-    case CSSPropertyFont: {
-      const CSSParserToken& token = range_.Peek();
-      if (token.Id() >= CSSValueCaption && token.Id() <= CSSValueStatusBar)
-        return ConsumeSystemFont(important);
-      return ConsumeFont(important);
-    }
-    case CSSPropertyFontVariant:
-      return ConsumeFontVariantShorthand(important);
     case CSSPropertyBorderSpacing:
       return ConsumeBorderSpacing(important);
     case CSSPropertyColumns:
       return ConsumeColumns(important);
     case CSSPropertyAnimation:
       return ConsumeAnimationShorthand(
           animationShorthandForParsing(),
           unresolved_property == CSSPropertyAliasWebkitAnimation, important);
     case CSSPropertyTransition:
       return ConsumeAnimationShorthand(transitionShorthandForParsing(), false,
@@ skipping 149 matching lines @@
     case CSSPropertyScrollSnapMarginBlock:
       return Consume2Values(scrollSnapMarginBlockShorthand(), important);
     case CSSPropertyScrollSnapMarginInline:
       return Consume2Values(scrollSnapMarginInlineShorthand(), important);
     default:
       return false;
   }
 }
 
 }  // namespace blink