Index: third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp |
diff --git a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp |
index b2dbf3486ab399232d5126b375b6ae7b6e3bf74d..615e435a3c662700e1d408bff33cb648821e2e69 100644 |
--- a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp |
+++ b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp |
@@ -49,7 +49,7 @@ struct SameSizeAsStyleRareInheritedData |
unsigned m_bitfields[2]; |
short pagedMediaShorts[2]; |
short hyphenationShorts[3]; |
- uint8_t snapHeight; |
+ uint8_t lineHeightStep; |
Color touchColors; |
TabSize tabSize; |
@@ -102,11 +102,10 @@ StyleRareInheritedData::StyleRareInheritedData() |
m_subtreeWillChangeContents(false), |
m_selfOrAncestorHasDirAutoAttribute(false), |
m_respectImageOrientation(false), |
- m_snapHeightPosition(0), |
hyphenationLimitBefore(-1), |
hyphenationLimitAfter(-1), |
hyphenationLimitLines(-1), |
- m_snapHeightUnit(0), |
+ m_lineHeightStep(0), |
tapHighlightColor(ComputedStyle::initialTapHighlightColor()), |
m_tabSize(ComputedStyle::initialTabSize()), |
m_textSizeAdjust(ComputedStyle::initialTextSizeAdjust()) {} |
@@ -169,12 +168,11 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) |
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_snapHeightUnit(o.m_snapHeightUnit), |
+ m_lineHeightStep(o.m_lineHeightStep), |
textEmphasisCustomMark(o.textEmphasisCustomMark), |
tapHighlightColor(o.tapHighlightColor), |
appliedTextDecorations(o.appliedTextDecorations), |
@@ -234,9 +232,8 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const { |
m_selfOrAncestorHasDirAutoAttribute == |
o.m_selfOrAncestorHasDirAutoAttribute && |
m_respectImageOrientation == o.m_respectImageOrientation && |
- m_snapHeightPosition == o.m_snapHeightPosition && |
hyphenationString == o.hyphenationString && |
- m_snapHeightUnit == o.m_snapHeightUnit && |
+ m_lineHeightStep == o.m_lineHeightStep && |
textEmphasisCustomMark == o.textEmphasisCustomMark && |
quotesDataEquivalent(o) && m_tabSize == o.m_tabSize && |
m_imageRendering == o.m_imageRendering && |