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

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

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 933f44f50e7a798b0085314f8891ba0dae0f1304..5253f89a7f567503a0124f4387dd5589962fce18 100644
--- a/Source/core/svg/SVGColor.cpp
+++ b/Source/core/svg/SVGColor.cpp
@@ -31,14 +31,12 @@ 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)
{
}
@@ -47,15 +45,13 @@ PassRefPtr<RGBColor> SVGColor::rgbColor() const
return RGBColor::create(m_color.rgb());
}
-bool SVGColor::colorFromRGBColorString(const String& colorString, Color& color)
+Color SVGColor::colorFromRGBColorString(const String& colorString)
{
// FIXME: Rework css parser so it is more SVG aware.
- RGBA32 rgba;
- if (CSSParser::parseColor(rgba, colorString.stripWhiteSpace())) {
- color = rgba;
- return true;
- }
- return false;
+ RGBA32 color;
+ if (CSSParser::parseColor(color, colorString.stripWhiteSpace()))
+ return color;
+ return Color();
}
void SVGColor::setRGBColor(const String&, ExceptionState& es)
@@ -85,7 +81,7 @@ String SVGColor::customCssText() const
// FIXME: No ICC color support.
return m_color.serialized();
case SVG_COLORTYPE_CURRENTCOLOR:
- if (m_valid)
+ if (m_color.isValid())
return m_color.serialized();
return "currentColor";
}

Powered by Google App Engine
This is Rietveld 408576698