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

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

Issue 950623002: Store resolved color in AppliedTextDecoration (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated patch with underline optimization handling Created 5 years, 9 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/layout/style/AppliedTextDecoration.h
diff --git a/Source/core/layout/style/AppliedTextDecoration.h b/Source/core/layout/style/AppliedTextDecoration.h
index ecb3bd30d0f7371135c064a494b0c3e4176c9cfa..7ba9d65815ba7b830206ea4bb9baee7c197c5792 100644
--- a/Source/core/layout/style/AppliedTextDecoration.h
+++ b/Source/core/layout/style/AppliedTextDecoration.h
@@ -5,27 +5,33 @@
#ifndef AppliedTextDecoration_h
#define AppliedTextDecoration_h
-#include "core/css/StyleColor.h"
#include "core/layout/style/LayoutStyleConstants.h"
+#include "platform/graphics/Color.h"
namespace blink {
class AppliedTextDecoration {
public:
- AppliedTextDecoration(TextDecoration, TextDecorationStyle, StyleColor);
- explicit AppliedTextDecoration(TextDecoration);
+ AppliedTextDecoration(TextDecoration, TextDecorationStyle, Color);
+ explicit AppliedTextDecoration(TextDecoration = TextDecorationNone);
TextDecoration line() const { return static_cast<TextDecoration>(m_line); }
+
+ void setStyle(TextDecorationStyle& style) { m_style = style; }
TextDecorationStyle style() const { return static_cast<TextDecorationStyle>(m_style); }
- bool isSimpleUnderline() const { return m_line == TextDecorationUnderline && m_style == TextDecorationStyleSolid && m_color.isCurrentColor(); }
+ void setColor(Color& color) { m_color = color; }
+ Color color() const { return m_color; }
+
+ bool isSimpleUnderline(bool isCurrentColor) const { return m_line == TextDecorationUnderline && m_style == TextDecorationStyleSolid && 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;
+ Color m_color;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698