Add support for multiple text decorations with same line positioning

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

Index: third_party/WebKit/Source/core/style/AppliedTextDecoration.h
diff --git a/third_party/WebKit/Source/core/style/AppliedTextDecoration.h b/third_party/WebKit/Source/core/style/AppliedTextDecoration.h
index 5713dfcaa77d9bc21117ac0ce6c00dbddccffc31..9142053ef8d27507d2f0a7ed83283846d4d3a573 100644
--- a/third_party/WebKit/Source/core/style/AppliedTextDecoration.h
+++ b/third_party/WebKit/Source/core/style/AppliedTextDecoration.h
@@ -5,8 +5,8 @@
 #ifndef AppliedTextDecoration_h
 #define AppliedTextDecoration_h
 
-#include "core/css/StyleColor.h"
 #include "core/style/ComputedStyleConstants.h"
+#include "platform/graphics/Color.h"
 #include "wtf/Allocator.h"
 
 namespace blink {
@@ -15,27 +15,24 @@ class AppliedTextDecoration {
   DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 
  public:
-  AppliedTextDecoration(TextDecoration, TextDecorationStyle, StyleColor);
-  explicit AppliedTextDecoration(TextDecoration);
+  AppliedTextDecoration(TextDecoration, TextDecorationStyle, Color);
 
-  TextDecoration line() const { return static_cast<TextDecoration>(m_line); }
+  TextDecoration lines() const { return static_cast<TextDecoration>(m_lines); }
   TextDecorationStyle style() const {
     return static_cast<TextDecorationStyle>(m_style);
   }
+  Color color() const { return m_color; }
+  void setColor(Color color) { m_color = color; }
 
-  bool isSimpleUnderline() const {
-    return m_line == TextDecorationUnderline &&
-           m_style == TextDecorationStyleSolid && m_color.isCurrentColor();
-  }
   bool operator==(const AppliedTextDecoration&) const;
   bool operator!=(const AppliedTextDecoration& o) const {
     return !(*this == o);
   }
 
  private:
-  unsigned m_line : TextDecorationBits;
+  unsigned m_lines : TextDecorationBits;
   unsigned m_style : 3;  // TextDecorationStyle
-  StyleColor m_color;
+  Color m_color;
 };
 
 }  // namespace blink