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

third_party/WebKit/Source/core/style/ComputedStyle.h

Index: third_party/WebKit/Source/core/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index ed8e7e1d62eaebd494ea9261bb7fd8b15e9887b9..bd5e230f315d6cf069ea08866b985fbc12c038fe 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -1942,18 +1942,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
   QuotesData* quotes() const { return m_rareInheritedData->quotes.get(); }
   void setQuotes(PassRefPtr<QuotesData>);
 
-  // snap-height
-  uint8_t snapHeightPosition() const {
-    return m_rareInheritedData->m_snapHeightPosition;
+  // line-height-step
+  static uint8_t initialLineHeightStep() { return 0; }
+  uint8_t lineHeightStep() const {
+    return m_rareInheritedData->m_lineHeightStep;
   }
-  uint8_t snapHeightUnit() const {
-    return m_rareInheritedData->m_snapHeightUnit;
-  }
-  void setSnapHeightPosition(uint8_t position) {
-    SET_VAR(m_rareInheritedData, m_snapHeightPosition, position);
-  }
-  void setSnapHeightUnit(uint8_t unit) {
-    SET_VAR(m_rareInheritedData, m_snapHeightUnit, unit);
+  void setLineHeightStep(uint8_t unit) {
+    SET_VAR(m_rareInheritedData, m_lineHeightStep, unit);
   }
 
   // speak