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

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

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/style/AppliedTextDecoration.h ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/AppliedTextDecoration.cpp
diff --git a/Source/core/rendering/style/AppliedTextDecoration.cpp b/Source/core/rendering/style/AppliedTextDecoration.cpp
index d428c3ca1981fb76309c5db1230f9c7a1030f5d6..ea8be8483a83cb691f21ba1088f3c75b6228d5fa 100644
--- a/Source/core/rendering/style/AppliedTextDecoration.cpp
+++ b/Source/core/rendering/style/AppliedTextDecoration.cpp
@@ -7,19 +7,30 @@
namespace WebCore {
+AppliedTextDecoration::AppliedTextDecoration(TextDecoration line, TextDecorationStyle style, StyleColor color)
+ : m_line(line)
+ , m_style(style)
+ , m_color(color)
+{
+}
+
AppliedTextDecoration::AppliedTextDecoration(TextDecoration line)
: m_line(line)
+ , m_style(TextDecorationStyleSolid)
+ , m_color(StyleColor::currentColor())
{
}
AppliedTextDecoration::AppliedTextDecoration()
: m_line(TextDecorationUnderline)
+ , m_style(TextDecorationStyleSolid)
+ , m_color(StyleColor::currentColor())
{
}
bool AppliedTextDecoration::operator==(const AppliedTextDecoration& o) const
{
- return m_line == o.m_line;
+ return m_color == o.m_color && m_line == o.m_line && m_style == o.m_style;
}
} // namespace WebCore
« no previous file with comments | « Source/core/rendering/style/AppliedTextDecoration.h ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698