Add support for multiple text decorations with same line positioning

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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 19 matching lines @@
 #include "core/style/QuotesData.h"
 #include "core/style/ShadowList.h"
 #include "core/style/StyleImage.h"
 
 namespace blink {
 
 struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareInheritedData> {
     void* styleImage;
     Color firstColor;
     float firstFloat;
-    Color colors[5];
+    Color colors[7];
     void* ownPtrs[1];
     AtomicString atomicStrings[4];
 #if ENABLE(OILPAN)
     void* refPtrs[1];
     Persistent<void*> persistentHandles[2];
 #else
     void* refPtrs[3];
 #endif
     Length lengths[1];
     float secondFloat;
@@ skipping 32 matching lines @@
     , textEmphasisFill(TextEmphasisFillFilled)
     , textEmphasisMark(TextEmphasisMarkNone)
     , textEmphasisPosition(TextEmphasisPositionOver)
     , m_textAlignLast(ComputedStyle::initialTextAlignLast())
     , m_textJustify(ComputedStyle::initialTextJustify())
     , m_textOrientation(TextOrientationVerticalRight)
     , m_textCombine(ComputedStyle::initialTextCombine())
     , 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)
     , m_respectImageOrientation(false)
     , hyphenationLimitBefore(-1)
     , hyphenationLimitAfter(-1)
     , hyphenationLimitLines(-1)
     , tapHighlightColor(ComputedStyle::initialTapHighlightColor())
+    , simpleUnderlineColor(Color::transparent)
+    , simpleUnderlineVisitedColor(Color::transparent)
     , m_tabSize(ComputedStyle::initialTabSize())
 {
 }
 
 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
     : RefCounted<StyleRareInheritedData>()
     , listStyleImage(o.listStyleImage)
     , m_textStrokeColor(o.m_textStrokeColor)
     , textStrokeWidth(o.textStrokeWidth)
     , m_textFillColor(o.m_textFillColor)
@@ skipping 26 matching lines @@
     , textEmphasisFill(o.textEmphasisFill)
     , textEmphasisMark(o.textEmphasisMark)
     , textEmphasisPosition(o.textEmphasisPosition)
     , 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_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)
     , m_respectImageOrientation(o.m_respectImageOrientation)
     , hyphenationString(o.hyphenationString)
     , hyphenationLimitBefore(o.hyphenationLimitBefore)
     , hyphenationLimitAfter(o.hyphenationLimitAfter)
     , hyphenationLimitLines(o.hyphenationLimitLines)
     , locale(o.locale)
     , textEmphasisCustomMark(o.textEmphasisCustomMark)
     , tapHighlightColor(o.tapHighlightColor)
+    , simpleUnderlineColor(o.simpleUnderlineColor)
+    , simpleUnderlineVisitedColor(o.simpleUnderlineVisitedColor)
     , appliedTextDecorations(o.appliedTextDecorations)
     , m_tabSize(o.m_tabSize)
 {
 }
 
 StyleRareInheritedData::~StyleRareInheritedData()
 {
 }
 
 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
@@ skipping 42 matching lines @@
         && m_textIndentType == o.m_textIndentType
         && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents
         && m_selfOrAncestorHasDirAutoAttribute == o.m_selfOrAncestorHasDirAutoAttribute
         && m_respectImageOrientation == o.m_respectImageOrientation
         && hyphenationString == o.hyphenationString
         && locale == o.locale
         && textEmphasisCustomMark == o.textEmphasisCustomMark
         && 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);
 }
 
 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