First Implementation of Snapped Points

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1908 matching lines @@
   list->Append(*caps_value);
 
   list->Append(*ValueForFontWeight(style));
   list->Append(*ValueForFontStretch(style));
   list->Append(*size_and_line_height);
   list->Append(*ValueForFontFamily(style));
 
   return list;
 }
 
+static CSSValue* ValueForScrollSnapType(const ScrollSnapType& type,
+                                        const ComputedStyle& style) {
+  if (type.axis != kSnapAxisNone) {
+    return CSSValuePair::Create(CSSIdentifierValue::Create(type.axis),
+                                CSSIdentifierValue::Create(type.strictness),
+                                CSSValuePair::kDropIdenticalValues);
+  }
+  return CSSIdentifierValue::Create(CSSValueNone);
+}
+
+static CSSValue* ValueForScrollSnapAlign(const ScrollSnapAlign& align,
+                                         const ComputedStyle& style) {
+  return CSSValuePair::Create(CSSIdentifierValue::Create(align.alignmentX),
+                              CSSIdentifierValue::Create(align.alignmentY),
+                              CSSValuePair::kDropIdenticalValues);
+}
+
 static CSSValue* ValueForScrollSnapDestination(const LengthPoint& destination,
                                                const ComputedStyle& style) {
   CSSValueList* list = CSSValueList::CreateSpaceSeparated();
   list->Append(*ZoomAdjustedPixelValueForLength(destination.X(), style));
   list->Append(*ZoomAdjustedPixelValueForLength(destination.Y(), style));
   return list;
 }
 
 static CSSValue* ValueForScrollSnapPoints(const ScrollSnapPoints& points,
                                           const ComputedStyle& style) {
@@ skipping 1472 matching lines @@
     case CSSPropertyMargin:
       return ValuesForSidesShorthand(marginShorthand(), style, layout_object,
                                      styled_node, allow_visited_style);
     case CSSPropertyOutline:
       return ValuesForShorthandProperty(outlineShorthand(), style,
                                         layout_object, styled_node,
                                         allow_visited_style);
     case CSSPropertyPadding:
       return ValuesForSidesShorthand(paddingShorthand(), style, layout_object,
                                      styled_node, allow_visited_style);
+    case CSSPropertyScrollPadding:
+      return ValuesForSidesShorthand(scrollPaddingShorthand(), style,
+                                     layout_object, styled_node,
+                                     allow_visited_style);
+    case CSSPropertyScrollPaddingBlock:
+      return ValuesForShorthandProperty(scrollPaddingBlockShorthand(), style,
+                                        layout_object, styled_node,
+                                        allow_visited_style);
+    case CSSPropertyScrollPaddingInline:
+      return ValuesForShorthandProperty(scrollPaddingInlineShorthand(), style,
+                                        layout_object, styled_node,
+                                        allow_visited_style);
+    case CSSPropertyScrollSnapMargin:
+      return ValuesForSidesShorthand(scrollSnapMarginShorthand(), style,
+                                     layout_object, styled_node,
+                                     allow_visited_style);
+    case CSSPropertyScrollSnapMarginBlock:
+      return ValuesForShorthandProperty(scrollSnapMarginBlockShorthand(), style,
+                                        layout_object, styled_node,
+                                        allow_visited_style);
+    case CSSPropertyScrollSnapMarginInline:
+      return ValuesForShorthandProperty(scrollSnapMarginInlineShorthand(),
+                                        style, layout_object, styled_node,
+                                        allow_visited_style);
     // Individual properties not part of the spec.
     case CSSPropertyBackgroundRepeatX:
     case CSSPropertyBackgroundRepeatY:
       return nullptr;
 
     case CSSPropertyOffset:
       return ValuesForShorthandProperty(offsetShorthand(), style, layout_object,
                                         styled_node, allow_visited_style);
 
     case CSSPropertyOffsetAnchor:
@@ skipping 210 matching lines @@
       return ZoomAdjustedPixelValueForLength(svg_style.X(), style);
     case CSSPropertyY:
       return ZoomAdjustedPixelValueForLength(svg_style.Y(), style);
     case CSSPropertyR:
       return ZoomAdjustedPixelValueForLength(svg_style.R(), style);
     case CSSPropertyRx:
       return ZoomAdjustedPixelValueForLength(svg_style.Rx(), style);
     case CSSPropertyRy:
       return ZoomAdjustedPixelValueForLength(svg_style.Ry(), style);
     case CSSPropertyScrollSnapType:
-      return CSSIdentifierValue::Create(style.GetScrollSnapType());
+      return ValueForScrollSnapType(style.GetScrollSnapType(), style);
     case CSSPropertyScrollSnapPointsX:
       return ValueForScrollSnapPoints(style.ScrollSnapPointsX(), style);
     case CSSPropertyScrollSnapPointsY:
       return ValueForScrollSnapPoints(style.ScrollSnapPointsY(), style);
     case CSSPropertyScrollSnapCoordinate:
       return ValueForScrollSnapCoordinate(style.ScrollSnapCoordinate(), style);
     case CSSPropertyScrollSnapDestination:
       return ValueForScrollSnapDestination(style.ScrollSnapDestination(),
                                            style);
+    case CSSPropertyScrollSnapAlign:
+      return ValueForScrollSnapAlign(style.GetScrollSnapAlign(), style);
+    case CSSPropertyScrollSnapStop:
+      return CSSIdentifierValue::Create(style.ScrollSnapStop());
+    case CSSPropertyScrollPaddingTop:
+      return ZoomAdjustedPixelValueForLength(style.ScrollPaddingTop(), style);
+    case CSSPropertyScrollPaddingRight:
+      return ZoomAdjustedPixelValueForLength(style.ScrollPaddingRight(), style);
+    case CSSPropertyScrollPaddingBottom:
+      return ZoomAdjustedPixelValueForLength(style.ScrollPaddingBottom(),
+                                             style);
+    case CSSPropertyScrollPaddingLeft:
+      return ZoomAdjustedPixelValueForLength(style.ScrollPaddingLeft(), style);
+    case CSSPropertyScrollPaddingBlockStart:
+      return ZoomAdjustedPixelValueForLength(style.ScrollPaddingBlockStart(),
+                                             style);
+    case CSSPropertyScrollPaddingBlockEnd:
+      return ZoomAdjustedPixelValueForLength(style.ScrollPaddingBlockEnd(),
+                                             style);
+    case CSSPropertyScrollPaddingInlineStart:
+      return ZoomAdjustedPixelValueForLength(style.ScrollPaddingInlineStart(),
+                                             style);
+    case CSSPropertyScrollPaddingInlineEnd:
+      return ZoomAdjustedPixelValueForLength(style.ScrollPaddingInlineEnd(),
+                                             style);
+    case CSSPropertyScrollSnapMarginTop:
+      return ZoomAdjustedPixelValueForLength(style.ScrollSnapMarginTop(),
+                                             style);
+    case CSSPropertyScrollSnapMarginRight:
+      return ZoomAdjustedPixelValueForLength(style.ScrollSnapMarginRight(),
+                                             style);
+    case CSSPropertyScrollSnapMarginBottom:
+      return ZoomAdjustedPixelValueForLength(style.ScrollSnapMarginBottom(),
+                                             style);
+    case CSSPropertyScrollSnapMarginLeft:
+      return ZoomAdjustedPixelValueForLength(style.ScrollSnapMarginLeft(),
+                                             style);
+    case CSSPropertyScrollSnapMarginBlockStart:
+      return ZoomAdjustedPixelValueForLength(style.ScrollSnapMarginBlockStart(),
+                                             style);
+    case CSSPropertyScrollSnapMarginBlockEnd:
+      return ZoomAdjustedPixelValueForLength(style.ScrollSnapMarginBlockEnd(),
+                                             style);
+    case CSSPropertyScrollSnapMarginInlineStart:
+      return ZoomAdjustedPixelValueForLength(
+          style.ScrollSnapMarginInlineStart(), style);
+    case CSSPropertyScrollSnapMarginInlineEnd:
+      return ZoomAdjustedPixelValueForLength(style.ScrollSnapMarginInlineEnd(),
+                                             style);
     case CSSPropertyTranslate: {
       if (!style.Translate())
         return CSSIdentifierValue::Create(CSSValueNone);
 
       CSSValueList* list = CSSValueList::CreateSpaceSeparated();
       if (layout_object && layout_object->IsBox()) {
         LayoutRect box = ToLayoutBox(layout_object)->BorderBoxRect();
         list->Append(*ZoomAdjustedPixelValue(
             FloatValueForLength(style.Translate()->X(), box.Width().ToFloat()),
             style));
@@ skipping 79 matching lines @@
     case CSSPropertyAll:
       return nullptr;
     default:
       break;
   }
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace blink