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

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

Issue 280503003: Fix incorrect style recalculation of text-decoration properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address review issues. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/style/AppliedTextDecoration.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/AppliedTextDecoration.h
diff --git a/Source/core/rendering/style/AppliedTextDecoration.h b/Source/core/rendering/style/AppliedTextDecoration.h
index 680254b8980e9062d978a64fbd567f2dddf222a9..fd0df809194b4af430940da01c62a70fa96ab844 100644
--- a/Source/core/rendering/style/AppliedTextDecoration.h
+++ b/Source/core/rendering/style/AppliedTextDecoration.h
@@ -5,22 +5,28 @@
#ifndef AppliedTextDecoration_h
#define AppliedTextDecoration_h
+#include "core/css/StyleColor.h"
#include "core/rendering/style/RenderStyleConstants.h"
namespace WebCore {
class AppliedTextDecoration {
public:
+ AppliedTextDecoration(TextDecoration, TextDecorationStyle, StyleColor);
explicit AppliedTextDecoration(TextDecoration);
AppliedTextDecoration();
TextDecoration line() const { return static_cast<TextDecoration>(m_line); }
+ TextDecorationStyle style() const { return static_cast<TextDecorationStyle>(m_style); }
+ 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_style : 3; // TextDecorationStyle
+ StyleColor m_color;
};
} // namespace WebCore
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/style/AppliedTextDecoration.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698