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

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 2523 matching lines @@
     case CSSPropertyWebkitLineClamp:
       if (style.lineClamp().isNone())
         return CSSIdentifierValue::create(CSSValueNone);
       return CSSPrimitiveValue::create(
           style.lineClamp().value(),
           style.lineClamp().isPercentage()
               ? CSSPrimitiveValue::UnitType::Percentage
               : CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyLineHeight:
       return valueForLineHeight(style);
+    case CSSPropertyLineHeightStep:
+      return zoomAdjustedPixelValue(style.lineHeightStep(), style);
     case CSSPropertyListStyleImage:
       if (style.listStyleImage())
         return style.listStyleImage()->computedCSSValue();
       return CSSIdentifierValue::create(CSSValueNone);
     case CSSPropertyListStylePosition:
       return CSSIdentifierValue::create(style.listStylePosition());
     case CSSPropertyListStyleType:
       return CSSIdentifierValue::create(style.listStyleType());
     case CSSPropertyWebkitLocale:
       if (style.locale().isNull())
@@ skipping 1093 matching lines @@
         list->append(*CSSIdentifierValue::create(CSSValueStyle));
       if (style.contain() & ContainsLayout)
         list->append(*CSSIdentifierValue::create(CSSValueLayout));
       if (style.containsPaint())
         list->append(*CSSIdentifierValue::create(CSSValuePaint));
       if (style.containsSize())
         list->append(*CSSIdentifierValue::create(CSSValueSize));
       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();
       return nullptr;
     case CSSPropertyAll:
       return nullptr;
     default:
       break;
   }
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
 }  // namespace blink