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

Unified Diff: Source/core/rendering/style/ShadowData.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/rendering/style/ShadowData.h
diff --git a/Source/core/rendering/style/ShadowData.h b/Source/core/rendering/style/ShadowData.h
index 9c98c083a1fda6bfe5456e6da9ef5fef88f134a8..bd6bf3cffbb5ca36dddb4a227cd7f77608636482 100644
--- a/Source/core/rendering/style/ShadowData.h
+++ b/Source/core/rendering/style/ShadowData.h
@@ -25,7 +25,7 @@
#ifndef ShadowData_h
#define ShadowData_h
-#include "core/platform/graphics/Color.h"
+#include "core/css/StyleColor.h"
#include "core/platform/graphics/FloatRect.h"
#include "core/platform/graphics/LayoutRect.h"
#include <wtf/OwnPtr.h>
@@ -40,7 +40,7 @@ class ShadowData {
WTF_MAKE_FAST_ALLOCATED;
public:
static PassOwnPtr<ShadowData> create() { return adoptPtr(new ShadowData); }
- static PassOwnPtr<ShadowData> create(const IntPoint& location, int blur, int spread, ShadowStyle style, const Color& color)
+ static PassOwnPtr<ShadowData> create(const IntPoint& location, int blur, int spread, ShadowStyle style, const StyleColor& color)
{
return adoptPtr(new ShadowData(location, blur, spread, style, color));
}
@@ -59,7 +59,7 @@ public:
int blur() const { return m_blur; }
int spread() const { return m_spread; }
ShadowStyle style() const { return m_style; }
- const Color& color() const { return m_color; }
+ const StyleColor& color() const { return m_color; }
const ShadowData* next() const { return m_next.get(); }
void setNext(PassOwnPtr<ShadowData> shadow) { m_next = shadow; }
@@ -75,7 +75,7 @@ private:
{
}
- ShadowData(const IntPoint& location, int blur, int spread, ShadowStyle style, const Color& color)
+ ShadowData(const IntPoint& location, int blur, int spread, ShadowStyle style, const StyleColor& color)
: m_location(location)
, m_blur(blur)
, m_spread(spread)
@@ -89,7 +89,7 @@ private:
IntPoint m_location;
int m_blur;
int m_spread;
- Color m_color;
+ StyleColor m_color;
ShadowStyle m_style;
OwnPtr<ShadowData> m_next;
};

Powered by Google App Engine
This is Rietveld 408576698