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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 26 matching lines...) Expand all
37 CanvasGradient::CanvasGradient(const FloatPoint& p0, const FloatPoint& p1) 37 CanvasGradient::CanvasGradient(const FloatPoint& p0, const FloatPoint& p1)
38 : m_gradient(Gradient::create(p0, p1)) 38 : m_gradient(Gradient::create(p0, p1))
39 { 39 {
40 } 40 }
41 41
42 CanvasGradient::CanvasGradient(const FloatPoint& p0, float r0, const FloatPoint& p1, float r1) 42 CanvasGradient::CanvasGradient(const FloatPoint& p0, float r0, const FloatPoint& p1, float r1)
43 : m_gradient(Gradient::create(p0, r0, p1, r1)) 43 : m_gradient(Gradient::create(p0, r0, p1, r1))
44 { 44 {
45 } 45 }
46 46
47 void CanvasGradient::addColorStop(float value, const String& color, ExceptionSta te& exceptionState) 47 void CanvasGradient::addColorStop(float value, const String& colorString, Except ionState& exceptionState)
48 { 48 {
49 if (!(value >= 0 && value <= 1.0f)) { 49 if (!(value >= 0 && value <= 1.0f)) {
50 exceptionState.throwDOMException(IndexSizeError, "The provided value (" + String::number(value) + ") is outside the range (0.0, 1.0)."); 50 exceptionState.throwDOMException(IndexSizeError, "The provided value (" + String::number(value) + ") is outside the range (0.0, 1.0).");
51 return; 51 return;
52 } 52 }
53 53
54 RGBA32 rgba = 0; 54 Color color = 0;
55 if (!parseColorOrCurrentColor(rgba, color, 0 /*canvas*/)) { 55 if (!parseColorOrCurrentColor(color, colorString, 0 /*canvas*/)) {
56 exceptionState.throwDOMException(SyntaxError, "The value provided ('" + color + "') could not be parsed as a color."); 56 exceptionState.throwDOMException(SyntaxError, "The value provided ('" + colorString + "') could not be parsed as a color.");
57 return; 57 return;
58 } 58 }
59 59
60 m_gradient->addColorStop(value, Color(rgba)); 60 m_gradient->addColorStop(value, color);
61 } 61 }
62 62
63 } // namespace 63 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698