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

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 1924 matching lines @@
   }
   void setOverflowWrap(EOverflowWrap b) {
     SET_VAR(m_rareInheritedData, overflowWrap, b);
   }
 
   // quotes
   static QuotesData* initialQuotes() { return 0; }
   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
   static ESpeak initialSpeak() { return SpeakNormal; }
   ESpeak speak() const {
     return static_cast<ESpeak>(m_rareInheritedData->speak);
   }
   void setSpeak(ESpeak s) { SET_VAR(m_rareInheritedData, speak, s); }
 
   // tab-size
@@ skipping 1839 matching lines @@
   m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h