Proper support for multiple text decorations.

Source/core/rendering/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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #include "core/rendering/style/StyleRareInheritedData.h"
 
+#include "core/rendering/style/AppliedTextDecoration.h"
 #include "core/rendering/style/CursorList.h"
 #include "core/rendering/style/DataEquivalency.h"
 #include "core/rendering/style/QuotesData.h"
 #include "core/rendering/style/RenderStyle.h"
 #include "core/rendering/style/RenderStyleConstants.h"
 #include "core/rendering/style/ShadowList.h"
 #include "core/rendering/style/StyleImage.h"
 
 namespace WebCore {
 
 struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareInheritedData> {
     void* styleImage;
     Color firstColor;
     float firstFloat;
     Color colors[5];
     void* ownPtrs[1];
     AtomicString atomicStrings[4];
-    void* refPtrs[2];
+    void* refPtrs[3];
     Length lengths[1];
     float secondFloat;
     unsigned m_bitfields[2];
     short pagedMediaShorts[2];
     unsigned unsigneds[1];
     short hyphenationShorts[3];
 
     Color touchColors;
 };
 
@@ skipping 92 matching lines @@
     , m_rubyPosition(o.m_rubyPosition)
     , m_touchActionDelay(o.m_touchActionDelay)
     , hyphenationString(o.hyphenationString)
     , hyphenationLimitBefore(o.hyphenationLimitBefore)
     , hyphenationLimitAfter(o.hyphenationLimitAfter)
     , hyphenationLimitLines(o.hyphenationLimitLines)
     , locale(o.locale)
     , textEmphasisCustomMark(o.textEmphasisCustomMark)
     , m_tabSize(o.m_tabSize)
     , tapHighlightColor(o.tapHighlightColor)
+    , appliedTextDecorations(o.appliedTextDecorations)
 {
 }
 
 StyleRareInheritedData::~StyleRareInheritedData()
 {
 }
 
+static bool appliedTextDecorationsEquivalent(const AppliedTextDecorationList* d1, const AppliedTextDecorationList* d2)
+{
+    return (d1 == d2) || (d1 && d2 && *d1 == *d2);
+}
+
 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
 {
     return m_textStrokeColor == o.m_textStrokeColor
         && textStrokeWidth == o.textStrokeWidth
         && m_textFillColor == o.m_textFillColor
         && m_textEmphasisColor == o.m_textEmphasisColor
         && m_visitedLinkTextStrokeColor == o.m_visitedLinkTextStrokeColor
         && m_visitedLinkTextFillColor == o.m_visitedLinkTextFillColor
         && m_visitedLinkTextEmphasisColor == o.m_visitedLinkTextEmphasisColor
         && tapHighlightColor == o.tapHighlightColor
@@ skipping 35 matching lines @@
         && m_textIndentType == o.m_textIndentType
         && m_lineBoxContain == o.m_lineBoxContain
         && 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_rubyPosition == o.m_rubyPosition
-        && dataEquivalent(listStyleImage.get(), o.listStyleImage.get());
+        && dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
+        && appliedTextDecorationsEquivalent(appliedTextDecorations.get(), o.appliedTextDecorations.get());

[Julien - ping for review, 2014/05/05 17:45:08]

I think dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) would
work here. If not, it would be better to implement a template specialization of
dataEquivalent for this case.

[andersr, 2014/05/06 13:15:29]

Done.

 }
 
 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 WebCore