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

Unified Diff: Source/core/svg/SVGColor.cpp

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/svg/SVGColor.cpp
diff --git a/Source/core/svg/SVGColor.cpp b/Source/core/svg/SVGColor.cpp
index 9d244c2c6740385eb0b8a33f9d379479dda89ef0..71782e964616e8241c815f677bc2356205cd3c1c 100644
--- a/Source/core/svg/SVGColor.cpp
+++ b/Source/core/svg/SVGColor.cpp
@@ -31,12 +31,14 @@ namespace WebCore {
SVGColor::SVGColor(const SVGColorType& colorType)
: CSSValue(SVGColorClass)
, m_colorType(colorType)
+ , m_valid(false)
{
}
SVGColor::SVGColor(ClassType classType, const SVGColorType& colorType)
: CSSValue(classType)
, m_colorType(colorType)
+ , m_valid(false)
{
}
@@ -45,13 +47,15 @@ PassRefPtr<RGBColor> SVGColor::rgbColor() const
return RGBColor::create(m_color.rgb());
}
-Color SVGColor::colorFromRGBColorString(const String& colorString)
+bool SVGColor::colorFromRGBColorString(const String& colorString, Color& color)
{
// FIXME: Rework css parser so it is more SVG aware.
- RGBA32 color;
- if (CSSParser::parseColor(color, colorString.stripWhiteSpace()))
- return color;
- return Color();
+ RGBA32 rgba;
+ if (CSSParser::parseColor(rgba, colorString.stripWhiteSpace())) {
+ color = rgba;
+ return true;
+ }
+ return false;
}
void SVGColor::setRGBColor(const String&, ExceptionCode& ec)
@@ -81,7 +85,7 @@ String SVGColor::customCssText() const
// FIXME: No ICC color support.
return m_color.serialized();
case SVG_COLORTYPE_CURRENTCOLOR:
- if (m_color.isValid())
+ if (m_valid)
return m_color.serialized();
return "currentColor";
}

Powered by Google App Engine
This is Rietveld 408576698