Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(367)

Side by Side Diff: Source/core/style/AppliedTextDecoration.h

Issue 950623002: Store resolved color in AppliedTextDecoration (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: removed inherited_flags.m_textunderline Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef AppliedTextDecoration_h 5 #ifndef AppliedTextDecoration_h
6 #define AppliedTextDecoration_h 6 #define AppliedTextDecoration_h
7 7
8 #include "core/css/StyleColor.h"
9 #include "core/style/ComputedStyleConstants.h" 8 #include "core/style/ComputedStyleConstants.h"
9 #include "platform/graphics/Color.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 class AppliedTextDecoration { 13 class AppliedTextDecoration {
14 public: 14 public:
15 AppliedTextDecoration(TextDecoration, TextDecorationStyle, StyleColor); 15 AppliedTextDecoration(TextDecoration, TextDecorationStyle, Color);
16 explicit AppliedTextDecoration(TextDecoration); 16 explicit AppliedTextDecoration(TextDecoration = TextDecorationNone);
17 17
18 TextDecoration line() const { return static_cast<TextDecoration>(m_line); } 18 TextDecoration line() const { return static_cast<TextDecoration>(m_line); }
19
20 void setStyle(TextDecorationStyle& style) { m_style = style; }
19 TextDecorationStyle style() const { return static_cast<TextDecorationStyle>( m_style); } 21 TextDecorationStyle style() const { return static_cast<TextDecorationStyle>( m_style); }
20 22
21 bool isSimpleUnderline() const { return m_line == TextDecorationUnderline && m_style == TextDecorationStyleSolid && m_color.isCurrentColor(); } 23 void setColor(Color& color) { m_color = color; }
24 Color color() const { return m_color; }
25
22 bool operator==(const AppliedTextDecoration&) const; 26 bool operator==(const AppliedTextDecoration&) const;
23 bool operator!=(const AppliedTextDecoration& o) const { return !(*this == o) ; } 27 bool operator!=(const AppliedTextDecoration& o) const { return !(*this == o) ; }
24 28
25 private: 29 private:
26 unsigned m_line : TextDecorationBits; 30 unsigned m_line : TextDecorationBits;
27 unsigned m_style : 3; // TextDecorationStyle 31 unsigned m_style : 3; // TextDecorationStyle
28 StyleColor m_color; 32 Color m_color;
29 }; 33 };
30 34
31 } // namespace blink 35 } // namespace blink
32 36
33 #endif // AppliedTextDecoration_h 37 #endif // AppliedTextDecoration_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698