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

Side by Side 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 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 #include "config.h" 5 #include "config.h"
6 #include "core/rendering/style/AppliedTextDecoration.h" 6 #include "core/rendering/style/AppliedTextDecoration.h"
7 7
8 namespace WebCore { 8 namespace WebCore {
9 9
10 AppliedTextDecoration::AppliedTextDecoration(TextDecoration line, TextDecoration Style style, StyleColor color)
11 : m_line(line)
12 , m_style(style)
13 , m_color(color)
14 {
15 }
16
10 AppliedTextDecoration::AppliedTextDecoration(TextDecoration line) 17 AppliedTextDecoration::AppliedTextDecoration(TextDecoration line)
11 : m_line(line) 18 : m_line(line)
19 , m_style(TextDecorationStyleSolid)
20 , m_color(StyleColor::currentColor())
12 { 21 {
13 } 22 }
14 23
15 AppliedTextDecoration::AppliedTextDecoration() 24 AppliedTextDecoration::AppliedTextDecoration()
16 : m_line(TextDecorationUnderline) 25 : m_line(TextDecorationUnderline)
26 , m_style(TextDecorationStyleSolid)
27 , m_color(StyleColor::currentColor())
17 { 28 {
18 } 29 }
19 30
20 bool AppliedTextDecoration::operator==(const AppliedTextDecoration& o) const 31 bool AppliedTextDecoration::operator==(const AppliedTextDecoration& o) const
21 { 32 {
22 return m_line == o.m_line; 33 return m_color == o.m_color && m_line == o.m_line && m_style == o.m_style;
23 } 34 }
24 35
25 } // namespace WebCore 36 } // namespace WebCore
OLDNEW
« 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