Re-land Catch up the spec update in CSS Rhythmic Sizing

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

Index: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
index 6c90124dc2247afd33c1b8994c3fdb5f85e33d2c..4227d239d689f8adb6c03b243fbfda8b7adaad54 100644
--- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
+++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
@@ -2541,6 +2541,8 @@ const CSSValue* ComputedStyleCSSValueMapping::get(
               : CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyLineHeight:
       return valueForLineHeight(style);
+    case CSSPropertyLineHeightStep:
+      return zoomAdjustedPixelValue(style.lineHeightStep(), style);
     case CSSPropertyListStyleImage:
       if (style.listStyleImage())
         return style.listStyleImage()->computedCSSValue();
@@ -3654,18 +3656,6 @@ const CSSValue* ComputedStyleCSSValueMapping::get(
       ASSERT(list->length());
       return list;
     }
-    case CSSPropertySnapHeight: {
-      if (!style.snapHeightUnit())
-        return CSSPrimitiveValue::create(0,
-                                         CSSPrimitiveValue::UnitType::Pixels);
-      CSSValueList* list = CSSValueList::createSpaceSeparated();
-      list->append(*CSSPrimitiveValue::create(
-          style.snapHeightUnit(), CSSPrimitiveValue::UnitType::Pixels));
-      if (style.snapHeightPosition())
-        list->append(*CSSPrimitiveValue::create(
-            style.snapHeightPosition(), CSSPrimitiveValue::UnitType::Integer));
-      return list;
-    }
     case CSSPropertyVariable:
       // Variables are retrieved via get(AtomicString).
       ASSERT_NOT_REACHED();