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

Unified Diff: Source/core/style/AppliedTextDecoration.h

Issue 1328283005: Add support for multiple text decorations with same line positioning (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Review feedback Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/style/AppliedTextDecoration.h
diff --git a/Source/core/style/AppliedTextDecoration.h b/Source/core/style/AppliedTextDecoration.h
index b8eb30ce563b075fdb43b984347dcfb4b5a56bad..2ee7eaa5d3a34a2a0132a77760f75cd1cb01373f 100644
--- a/Source/core/style/AppliedTextDecoration.h
+++ b/Source/core/style/AppliedTextDecoration.h
@@ -14,20 +14,28 @@ namespace blink {
class AppliedTextDecoration {
ALLOW_ONLY_INLINE_ALLOCATION();
public:
- AppliedTextDecoration(TextDecoration, TextDecorationStyle, StyleColor);
+ AppliedTextDecoration(TextDecoration, TextDecorationStyle, Color, bool isAffectedByPropagatedColors = false);
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; }
+ bool isAffectedByPropagatedColors() const { return m_isAffectedByPropagatedColors; }
+
+ void applyPropagatedColor(Color color)
+ {
+ ASSERT(m_isAffectedByPropagatedColors);
+ 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;
+ unsigned m_isAffectedByPropagatedColors : 1;
+ Color m_color;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698