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

Unified Diff: third_party/WebKit/Source/modules/canvas2d/CanvasGradient.cpp

Issue 1399853005: Changed CSSColorValue to return a Color (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_color
Patch Set: Rebase Created 5 years, 1 month 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: third_party/WebKit/Source/modules/canvas2d/CanvasGradient.cpp
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasGradient.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasGradient.cpp
index 3d5f361a80498563dee99576b8175bb83fbc0a58..01b1c50cfe90688b9e4dc26132c02c56ed5daa4b 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasGradient.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasGradient.cpp
@@ -44,20 +44,20 @@ CanvasGradient::CanvasGradient(const FloatPoint& p0, float r0, const FloatPoint&
{
}
-void CanvasGradient::addColorStop(float value, const String& color, ExceptionState& exceptionState)
+void CanvasGradient::addColorStop(float value, const String& colorString, ExceptionState& exceptionState)
{
if (!(value >= 0 && value <= 1.0f)) {
exceptionState.throwDOMException(IndexSizeError, "The provided value (" + String::number(value) + ") is outside the range (0.0, 1.0).");
return;
}
- RGBA32 rgba = 0;
- if (!parseColorOrCurrentColor(rgba, color, 0 /*canvas*/)) {
- exceptionState.throwDOMException(SyntaxError, "The value provided ('" + color + "') could not be parsed as a color.");
+ Color color = 0;
+ if (!parseColorOrCurrentColor(color, colorString, 0 /*canvas*/)) {
+ exceptionState.throwDOMException(SyntaxError, "The value provided ('" + colorString + "') could not be parsed as a color.");
return;
}
- m_gradient->addColorStop(value, Color(rgba));
+ m_gradient->addColorStop(value, color);
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698