Update the snap points css properties

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"
@@ skipping 789 matching lines @@
     context->Count(WebFeature::kUnitlessPerspectiveInPerspectiveProperty);
     parsed_value = CSSPrimitiveValue::Create(
         perspective, CSSPrimitiveValue::UnitType::kPixels);
   }
   if (parsed_value &&
       (parsed_value->IsCalculated() || parsed_value->GetDoubleValue() > 0))
     return parsed_value;
   return nullptr;
 }
 
-static CSSValue* ConsumeScrollSnapPoints(CSSParserTokenRange& range,
-                                         CSSParserMode css_parser_mode) {
-  if (range.Peek().Id() == CSSValueNone)
-    return ConsumeIdent(range);
-  if (range.Peek().FunctionId() == CSSValueRepeat) {
-    CSSParserTokenRange args = ConsumeFunction(range);
-    CSSPrimitiveValue* parsed_value =
-        ConsumeLengthOrPercent(args, css_parser_mode, kValueRangeNonNegative);
-    if (args.AtEnd() && parsed_value &&
-        (parsed_value->IsCalculated() || parsed_value->GetDoubleValue() > 0)) {
-      CSSFunctionValue* result = CSSFunctionValue::Create(CSSValueRepeat);
-      result->Append(*parsed_value);
-      return result;
-    }
-  }
-  return nullptr;
-}
-
 static CSSValue* ConsumeReflect(CSSParserTokenRange& range,
                                 const CSSParserContext* context) {
   CSSIdentifierValue* direction =
       ConsumeIdent<CSSValueAbove, CSSValueBelow, CSSValueLeft, CSSValueRight>(
           range);
   if (!direction)
     return nullptr;
 
   CSSPrimitiveValue* offset = nullptr;
   if (range.AtEnd()) {
@@ skipping 689 matching lines @@
           range_, *context_, UnitlessQuirk::kAllow);
     case CSSPropertyInlineSize:
     case CSSPropertyBlockSize:
     case CSSPropertyMinInlineSize:
     case CSSPropertyMinBlockSize:
     case CSSPropertyWebkitMinLogicalWidth:
     case CSSPropertyWebkitMinLogicalHeight:
     case CSSPropertyWebkitLogicalWidth:
     case CSSPropertyWebkitLogicalHeight:
       return CSSPropertyLengthUtils::ConsumeWidthOrHeight(range_, *context_);
-    case CSSPropertyScrollSnapDestination:
-      // TODO(crbug.com/724912): Retire scroll-snap-destination
-      return ConsumePosition(range_, *context_, UnitlessQuirk::kForbid,
-                             Optional<WebFeature>());
     case CSSPropertyObjectPosition:
       return ConsumePosition(range_, *context_, UnitlessQuirk::kForbid,
                              WebFeature::kThreeValuedPositionObjectPosition);
     case CSSPropertyPerspectiveOrigin:
       return ConsumePosition(range_, *context_, UnitlessQuirk::kForbid,
                              WebFeature::kThreeValuedPositionPerspectiveOrigin);
     case CSSPropertyWebkitHyphenateCharacter:
     case CSSPropertyWebkitLocale:
       return ConsumeLocale(range_);
     case CSSPropertyAnimationDelay:
@@ skipping 96 matching lines @@
     case CSSPropertyCy:
     case CSSPropertyX:
     case CSSPropertyY:
     case CSSPropertyR:
       return ConsumeLengthOrPercent(range_, kSVGAttributeMode, kValueRangeAll,
                                     UnitlessQuirk::kForbid);
     case CSSPropertyPerspective:
       return ConsumePerspective(
           range_, context_,
           unresolved_property == CSSPropertyAliasWebkitPerspective);
-    case CSSPropertyScrollSnapPointsX:
-    case CSSPropertyScrollSnapPointsY:
-      return ConsumeScrollSnapPoints(range_, context_->Mode());
     case CSSPropertyBorderImageRepeat:
     case CSSPropertyWebkitMaskBoxImageRepeat:
       return CSSPropertyBorderImageUtils::ConsumeBorderImageRepeat(range_);
     case CSSPropertyBorderImageSlice:
     case CSSPropertyWebkitMaskBoxImageSlice:
       return CSSPropertyBorderImageUtils::ConsumeBorderImageSlice(
           range_, false /* default_fill */);
     case CSSPropertyBorderImageOutset:
     case CSSPropertyWebkitMaskBoxImageOutset:
       return CSSPropertyBorderImageUtils::ConsumeBorderImageOutset(range_);
@@ skipping 666 matching lines @@
 
   AddExpandedPropertyForValue(CSSPropertyBorderWidth, *width, important);
   AddExpandedPropertyForValue(CSSPropertyBorderStyle, *style, important);
   AddExpandedPropertyForValue(CSSPropertyBorderColor, *color, important);
   AddExpandedPropertyForValue(CSSPropertyBorderImage,
                               *CSSInitialValue::Create(), important);
 
   return range_.AtEnd();
 }
 
+bool CSSPropertyParser::Consume2Values(const StylePropertyShorthand& shorthand,
+                                       bool important) {
+  DCHECK_EQ(shorthand.length(), 2u);
+  const CSSPropertyID* longhands = shorthand.properties();
+  const CSSValue* start = ParseSingleValue(longhands[0], shorthand.id());
+  if (!start)
+    return false;
+
+  const CSSValue* end = ParseSingleValue(longhands[1], shorthand.id());
+  if (!end)
+    end = start;
+  AddParsedProperty(longhands[0], shorthand.id(), *start, important);
+  AddParsedProperty(longhands[1], shorthand.id(), *end, important);
+
+  return range_.AtEnd();
+}
+
 bool CSSPropertyParser::Consume4Values(const StylePropertyShorthand& shorthand,
                                        bool important) {
   DCHECK_EQ(shorthand.length(), 4u);
   const CSSPropertyID* longhands = shorthand.properties();
   const CSSValue* top = ParseSingleValue(longhands[0], shorthand.id());
   if (!top)
     return false;
 
   const CSSValue* right = ParseSingleValue(longhands[1], shorthand.id());
   const CSSValue* bottom = nullptr;
@@ skipping 923 matching lines @@
     case CSSPropertyGridTemplate:
       return ConsumeGridTemplateShorthand(CSSPropertyGridTemplate, important);
     case CSSPropertyGrid:
       return ConsumeGridShorthand(important);
     case CSSPropertyPlaceContent:
       return ConsumePlaceContentShorthand(important);
     case CSSPropertyPlaceItems:
       return ConsumePlaceItemsShorthand(important);
     case CSSPropertyPlaceSelf:
       return ConsumePlaceSelfShorthand(important);
+    case CSSPropertyScrollPadding:
+      return Consume4Values(scrollPaddingShorthand(), important);
+    case CSSPropertyScrollPaddingBlock:
+      return Consume2Values(scrollPaddingBlockShorthand(), important);
+    case CSSPropertyScrollPaddingInline:
+      return Consume2Values(scrollPaddingInlineShorthand(), important);
+    case CSSPropertyScrollSnapMargin:
+      return Consume4Values(scrollSnapMarginShorthand(), important);
+    case CSSPropertyScrollSnapMarginBlock:
+      return Consume2Values(scrollSnapMarginBlockShorthand(), important);
+    case CSSPropertyScrollSnapMarginInline:
+      return Consume2Values(scrollSnapMarginInlineShorthand(), important);
     default:
       return false;
   }
 }
 
 }  // namespace blink