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

Unified Diff: Source/core/css/StyleColor.h

Issue 20061003: Move isValid/isCurrentColor from Color to StyleColor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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/css/StyleColor.h
diff --git a/Source/core/css/StyleColor.h b/Source/core/css/StyleColor.h
index eb893e4601af8caf5228a139df77dda7fca02967..41c9f971bdb6b34a30623ed8a5689c1e5280a520 100644
--- a/Source/core/css/StyleColor.h
+++ b/Source/core/css/StyleColor.h
@@ -43,11 +43,11 @@ public:
: m_color()
, m_valid(false)
, m_currentColor(false) { }
- StyleColor(Color color)
+ StyleColor(RGBA32 color)
: m_color(color)
, m_valid(true)
, m_currentColor(false) { }
- StyleColor(RGBA32 color, bool valid = true, bool currentColor = false)
+ StyleColor(Color color, bool valid = true, bool currentColor = false)
: m_color(color)
, m_valid(valid)
, m_currentColor(currentColor) { }
@@ -63,12 +63,15 @@ public:
: m_color(other.m_color)
, m_valid(other.m_valid)
, m_currentColor(other.m_currentColor) { }
+ explicit StyleColor(const String&);
+ explicit StyleColor(const char*);
Color color() const { return m_color; }
bool isValid() const { return m_valid; }
bool isCurrentColor() const { return m_currentColor; }
bool hasAlpha() const { return m_color.hasAlpha(); }
+ void setNamedColor(const String&);
void setRGB(int r, int g, int b)
{
m_color.setRGB(r, g, b);

Powered by Google App Engine
This is Rietveld 408576698