Revert of Catch up the spec update in CSS Rhythmic Sizing

third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 31 matching lines @@
   Color colors[7];
   void* ownPtrs[1];
   AtomicString atomicStrings[3];
   void* refPtrs[1];
   Persistent<void*> persistentHandles[2];
   Length lengths[1];
   float secondFloat;
   unsigned m_bitfields[2];
   short pagedMediaShorts[2];
   short hyphenationShorts[3];
-  uint8_t lineHeightStep;
+  uint8_t snapHeight;
 
   Color touchColors;
   TabSize tabSize;
   void* variables[1];
   TextSizeAdjust textSizeAdjust;
 };
 
 static_assert(sizeof(StyleRareInheritedData) <=
                   sizeof(SameSizeAsStyleRareInheritedData),
               "StyleRareInheritedData should stay small");
@@ skipping 32 matching lines @@
       m_textCombine(ComputedStyle::initialTextCombine()),
       m_textIndentLine(ComputedStyle::initialTextIndentLine()),
       m_textIndentType(ComputedStyle::initialTextIndentLine()),
       m_imageRendering(ComputedStyle::initialImageRendering()),
       m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition()),
       m_textDecorationSkip(ComputedStyle::initialTextDecorationSkip()),
       m_rubyPosition(ComputedStyle::initialRubyPosition()),
       m_subtreeWillChangeContents(false),
       m_selfOrAncestorHasDirAutoAttribute(false),
       m_respectImageOrientation(false),
+      m_snapHeightPosition(0),
       hyphenationLimitBefore(-1),
       hyphenationLimitAfter(-1),
       hyphenationLimitLines(-1),
-      m_lineHeightStep(0),
+      m_snapHeightUnit(0),
       tapHighlightColor(ComputedStyle::initialTapHighlightColor()),
       m_tabSize(ComputedStyle::initialTabSize()),
       m_textSizeAdjust(ComputedStyle::initialTextSizeAdjust()) {}
 
 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
     : RefCounted<StyleRareInheritedData>(),
       listStyleImage(o.listStyleImage),
       m_textStrokeColor(o.m_textStrokeColor),
       textStrokeWidth(o.textStrokeWidth),
       m_textFillColor(o.m_textFillColor),
@@ skipping 42 matching lines @@
       m_textIndentLine(o.m_textIndentLine),
       m_textIndentType(o.m_textIndentType),
       m_imageRendering(o.m_imageRendering),
       m_textUnderlinePosition(o.m_textUnderlinePosition),
       m_textDecorationSkip(o.m_textDecorationSkip),
       m_rubyPosition(o.m_rubyPosition),
       m_subtreeWillChangeContents(o.m_subtreeWillChangeContents),
       m_selfOrAncestorHasDirAutoAttribute(
           o.m_selfOrAncestorHasDirAutoAttribute),
       m_respectImageOrientation(o.m_respectImageOrientation),
+      m_snapHeightPosition(o.m_snapHeightPosition),
       hyphenationString(o.hyphenationString),
       hyphenationLimitBefore(o.hyphenationLimitBefore),
       hyphenationLimitAfter(o.hyphenationLimitAfter),
       hyphenationLimitLines(o.hyphenationLimitLines),
-      m_lineHeightStep(o.m_lineHeightStep),
+      m_snapHeightUnit(o.m_snapHeightUnit),
       textEmphasisCustomMark(o.textEmphasisCustomMark),
       tapHighlightColor(o.tapHighlightColor),
       appliedTextDecorations(o.appliedTextDecorations),
       m_tabSize(o.m_tabSize),
       variables(o.variables),
       m_textSizeAdjust(o.m_textSizeAdjust) {}
 
 StyleRareInheritedData::~StyleRareInheritedData() {}
 
 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const {
@@ skipping 39 matching lines @@
          m_textAlignLast == o.m_textAlignLast &&
          m_textJustify == o.m_textJustify &&
          m_textOrientation == o.m_textOrientation &&
          m_textCombine == o.m_textCombine &&
          m_textIndentLine == o.m_textIndentLine &&
          m_textIndentType == o.m_textIndentType &&
          m_subtreeWillChangeContents == o.m_subtreeWillChangeContents &&
          m_selfOrAncestorHasDirAutoAttribute ==
              o.m_selfOrAncestorHasDirAutoAttribute &&
          m_respectImageOrientation == o.m_respectImageOrientation &&
+         m_snapHeightPosition == o.m_snapHeightPosition &&
          hyphenationString == o.hyphenationString &&
-         m_lineHeightStep == o.m_lineHeightStep &&
+         m_snapHeightUnit == o.m_snapHeightUnit &&
          textEmphasisCustomMark == o.textEmphasisCustomMark &&
          quotesDataEquivalent(o) && m_tabSize == o.m_tabSize &&
          m_imageRendering == o.m_imageRendering &&
          m_textUnderlinePosition == o.m_textUnderlinePosition &&
          m_textDecorationSkip == o.m_textDecorationSkip &&
          m_rubyPosition == o.m_rubyPosition &&
          dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) &&
          dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) &&
          dataEquivalent(variables, o.variables) &&
          m_textSizeAdjust == o.m_textSizeAdjust;
 }
 
 bool StyleRareInheritedData::shadowDataEquivalent(
     const StyleRareInheritedData& o) const {
   return dataEquivalent(textShadow.get(), o.textShadow.get());
 }
 
 bool StyleRareInheritedData::quotesDataEquivalent(
     const StyleRareInheritedData& o) const {
   return dataEquivalent(quotes, o.quotes);
 }
 
 }  // namespace blink