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

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

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.h
diff --git a/Source/core/svg/SVGColor.h b/Source/core/svg/SVGColor.h
index 0622a702e9120d2bad5f5e9ad7bfb72f8e170891..554fe77052b62af0e49a077e244593801cd12778 100644
--- a/Source/core/svg/SVGColor.h
+++ b/Source/core/svg/SVGColor.h
@@ -43,7 +43,7 @@ public:
static PassRefPtr<SVGColor> createFromString(const String& rgbColor)
{
RefPtr<SVGColor> color = adoptRef(new SVGColor(SVG_COLORTYPE_RGBCOLOR));
- color->m_valid = colorFromRGBColorString(rgbColor, color->m_color);
+ color->setColor(colorFromRGBColorString(rgbColor));
return color.release();
}
@@ -63,13 +63,7 @@ public:
const SVGColorType& colorType() const { return m_colorType; }
PassRefPtr<RGBColor> rgbColor() const;
- static bool colorFromRGBColorString(const String&, Color&);
- static Color colorFromRGBColorString(const String& s)
- {
- Color color;
- colorFromRGBColorString(s, color);
- return color;
- }
+ static Color colorFromRGBColorString(const String&);
void setRGBColor(const String& rgbColor, ExceptionState&);
void setRGBColorICCColor(const String& rgbColor, const String& iccColor, ExceptionState&);
@@ -89,7 +83,7 @@ protected:
SVGColor(ClassType, const SVGColorType&);
SVGColor(ClassType, const SVGColor& cloneFrom);
- void setColor(const Color& color) { m_color = color; m_valid = true; }
+ void setColor(const Color& color) { m_color = color; }
void setColorType(const SVGColorType& type) { m_colorType = type; }
private:
@@ -97,7 +91,6 @@ private:
Color m_color;
SVGColorType m_colorType;
- bool m_valid;
};
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698