Add support for multiple text decorations with same line positioning

third_party/WebKit/Source/core/style/ComputedStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 201 matching lines @@
       // TODO(sashab): Generate this function.
       return (m_pointerEvents == other.m_pointerEvents);
     }
 
     inline bool compareEqualNonIndependent(const InheritedData& other) const {
       return (m_captionSide == other.m_captionSide) &&
              (m_listStyleType == other.m_listStyleType) &&
              (m_listStylePosition == other.m_listStylePosition) &&
              (m_textAlign == other.m_textAlign) &&
              (m_textTransform == other.m_textTransform) &&
-             (m_textUnderline == other.m_textUnderline) &&
+             (m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
              (m_cursorStyle == other.m_cursorStyle) &&
              (m_direction == other.m_direction) &&
              (m_whiteSpace == other.m_whiteSpace) &&
              (m_borderCollapse == other.m_borderCollapse) &&
              (m_boxDirection == other.m_boxDirection) &&
              (m_rtlOrdering == other.m_rtlOrdering) &&
              (m_printColorAdjust == other.m_printColorAdjust) &&
              (m_insideLink == other.m_insideLink) &&
              (m_writingMode == other.m_writingMode);
     }
 
     unsigned m_captionSide : 2;        // ECaptionSide
     unsigned m_listStyleType : 7;      // EListStyleType
     unsigned m_listStylePosition : 1;  // EListStylePosition
     unsigned m_textAlign : 4;          // ETextAlign
     unsigned m_textTransform : 2;      // ETextTransform
-    unsigned m_textUnderline : 1;
+    unsigned m_hasSimpleUnderline : 1;  // True if 'underline solid' is the only
+                                        // text decoration on this element.
     unsigned m_cursorStyle : 6;     // ECursor
     unsigned m_direction : 1;       // TextDirection
     unsigned m_whiteSpace : 3;      // EWhiteSpace
     unsigned m_borderCollapse : 1;  // EBorderCollapse
     unsigned m_boxDirection : 1;  // EBoxDirection (CSS3 box_direction property,
                                   // flexible box layout module)
     // 32 bits
 
     // non CSS2 inherited
     unsigned m_rtlOrdering : 1;  // Order
@@ skipping 112 matching lines @@
 
   void setBitDefaults() {
     ComputedStyleBase::setBitDefaults();
     m_inheritedData.m_captionSide = static_cast<unsigned>(initialCaptionSide());
     m_inheritedData.m_listStyleType =
         static_cast<unsigned>(initialListStyleType());
     m_inheritedData.m_listStylePosition =
         static_cast<unsigned>(initialListStylePosition());
     m_inheritedData.m_textAlign = initialTextAlign();
     m_inheritedData.m_textTransform = initialTextTransform();
-    m_inheritedData.m_textUnderline = false;
+    m_inheritedData.m_hasSimpleUnderline = false;
     m_inheritedData.m_cursorStyle = initialCursor();
     m_inheritedData.m_direction = initialDirection();
     m_inheritedData.m_whiteSpace = initialWhiteSpace();
     m_inheritedData.m_borderCollapse = initialBorderCollapse();
     m_inheritedData.m_rtlOrdering = initialRTLOrdering();
     m_inheritedData.m_boxDirection = initialBoxDirection();
     m_inheritedData.m_printColorAdjust = initialPrintColorAdjust();
     m_inheritedData.m_pointerEvents = initialPointerEvents();
     m_inheritedData.m_insideLink = NotInsideLink;
     m_inheritedData.m_writingMode = initialWritingMode();
@@ skipping 3171 matching lines @@
 
   // Cursor utility functions.
   CursorList* cursors() const { return m_rareInheritedData->cursorData.get(); }
   void addCursor(StyleImage*,
                  bool hotSpotSpecified,
                  const IntPoint& hotSpot = IntPoint());
   void setCursorList(CursorList*);
   void clearCursorList();
 
   // Text decoration utility functions.
-  void applyTextDecorations();
+  void applyTextDecorations(const Color& parentTextDecorationColor,
+                            bool overrideExistingColors);
   void clearAppliedTextDecorations();
   void restoreParentTextDecorations(const ComputedStyle& parentStyle);
   const Vector<AppliedTextDecoration>& appliedTextDecorations() const;
   TextDecoration textDecorationsInEffect() const;
 
   // Overflow utility functions.
 
   EOverflow overflowInlineDirection() const {
     return isHorizontalWritingMode() ? overflowX() : overflowY();
   }
@@ skipping 411 matching lines @@
   }
 
   StyleColor decorationColorIncludingFallback(bool visitedLink) const;
   Color colorIncludingFallback(int colorProperty, bool visitedLink) const;
 
   Color stopColor() const { return svgStyle().stopColor(); }
   Color floodColor() const { return svgStyle().floodColor(); }
   Color lightingColor() const { return svgStyle().lightingColor(); }
 
   void addAppliedTextDecoration(const AppliedTextDecoration&);
+  void overrideTextDecorationColors(Color propagatedColor);
   void applyMotionPathTransform(float originX,
                                 float originY,
                                 const FloatRect& boundingBox,
                                 TransformationMatrix&) const;
 
   bool scrollAnchorDisablingPropertyChanged(const ComputedStyle& other,
                                             StyleDifference&) const;
   bool diffNeedsFullLayoutAndPaintInvalidation(
       const ComputedStyle& other) const;
   bool diffNeedsFullLayout(const ComputedStyle& other) const;
@@ skipping 98 matching lines @@
   m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h