| 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 b8eb30ce563b075fdb43b984347dcfb4b5a56bad..fd40793e3d4ca4f4ee31e8e36470d7768ae241d1 100644
|
| --- a/third_party/WebKit/Source/core/style/AppliedTextDecoration.h
|
| +++ b/third_party/WebKit/Source/core/style/AppliedTextDecoration.h
|
| @@ -14,20 +14,21 @@ namespace blink {
|
| class AppliedTextDecoration {
|
| ALLOW_ONLY_INLINE_ALLOCATION();
|
| public:
|
| - AppliedTextDecoration(TextDecoration, TextDecorationStyle, StyleColor);
|
| + AppliedTextDecoration(TextDecoration, TextDecorationStyle, Color);
|
| explicit AppliedTextDecoration(TextDecoration);
|
|
|
| - 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
|
|
|