Add support for multiple text decorations with same line positioning

Source/core/style/StyleRareInheritedData.cpp

Index: Source/core/style/StyleRareInheritedData.cpp
diff --git a/Source/core/style/StyleRareInheritedData.cpp b/Source/core/style/StyleRareInheritedData.cpp
index d12593a9956a1c60757ca018adcd4ad5fc644c92..6f5e8cdcdfd8e68b81ed655830f552b9391e7f46 100644
--- a/Source/core/style/StyleRareInheritedData.cpp
+++ b/Source/core/style/StyleRareInheritedData.cpp
@@ -37,7 +37,7 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI
     void* styleImage;
     Color firstColor;
     float firstFloat;
-    Color colors[5];
+    Color colors[7];
     void* ownPtrs[1];
     AtomicString atomicStrings[4];
 #if ENABLE(OILPAN)
@@ -90,7 +90,7 @@ StyleRareInheritedData::StyleRareInheritedData()
     , m_textIndentLine(ComputedStyle::initialTextIndentLine())
     , m_textIndentType(ComputedStyle::initialTextIndentLine())
     , m_imageRendering(ComputedStyle::initialImageRendering())
-    , m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition())
+    , m_hasSimpleUnderlinePosition(ComputedStyle::initialTextUnderlinePosition())
     , m_rubyPosition(ComputedStyle::initialRubyPosition())
     , m_subtreeWillChangeContents(false)
     , m_selfOrAncestorHasDirAutoAttribute(false)
@@ -99,6 +99,8 @@ StyleRareInheritedData::StyleRareInheritedData()
     , hyphenationLimitAfter(-1)
     , hyphenationLimitLines(-1)
     , tapHighlightColor(ComputedStyle::initialTapHighlightColor())
+    , simpleUnderlineColor(Color::transparent)
+    , simpleUnderlineVisitedColor(Color::transparent)
     , m_tabSize(ComputedStyle::initialTabSize())
 {
 }
@@ -145,7 +147,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
     , m_textIndentLine(o.m_textIndentLine)
     , m_textIndentType(o.m_textIndentType)
     , m_imageRendering(o.m_imageRendering)
-    , m_textUnderlinePosition(o.m_textUnderlinePosition)
+    , m_hasSimpleUnderlinePosition(o.m_hasSimpleUnderlinePosition)
     , m_rubyPosition(o.m_rubyPosition)
     , m_subtreeWillChangeContents(o.m_subtreeWillChangeContents)
     , m_selfOrAncestorHasDirAutoAttribute(o.m_selfOrAncestorHasDirAutoAttribute)
@@ -157,6 +159,8 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
     , locale(o.locale)
     , textEmphasisCustomMark(o.textEmphasisCustomMark)
     , tapHighlightColor(o.tapHighlightColor)
+    , simpleUnderlineColor(o.simpleUnderlineColor)
+    , simpleUnderlineVisitedColor(o.simpleUnderlineVisitedColor)
     , appliedTextDecorations(o.appliedTextDecorations)
     , m_tabSize(o.m_tabSize)
 {
@@ -219,9 +223,11 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
         && quotesDataEquivalent(o)
         && m_tabSize == o.m_tabSize
         && m_imageRendering == o.m_imageRendering
-        && m_textUnderlinePosition == o.m_textUnderlinePosition
+        && m_hasSimpleUnderlinePosition == o.m_hasSimpleUnderlinePosition
         && m_rubyPosition == o.m_rubyPosition
         && dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
+        && simpleUnderlineColor == o.simpleUnderlineColor
+        && simpleUnderlineVisitedColor == o.simpleUnderlineVisitedColor
         && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations);
 }