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

Side by Side Diff: sky/engine/core/html/canvas/CanvasGradient.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 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
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "sky/engine/config.h" 27 #include "sky/engine/config.h"
28 #include "sky/engine/core/html/canvas/CanvasGradient.h" 28 #include "sky/engine/core/html/canvas/CanvasGradient.h"
29 29
30 #include "sky/engine/bindings/core/v8/ExceptionState.h" 30 #include "sky/engine/bindings2/exception_state.h"
31 #include "sky/engine/core/dom/ExceptionCode.h" 31 #include "sky/engine/core/dom/ExceptionCode.h"
32 #include "sky/engine/core/html/canvas/CanvasPattern.h" 32 #include "sky/engine/core/html/canvas/CanvasPattern.h"
33 #include "sky/engine/core/html/canvas/CanvasStyle.h" 33 #include "sky/engine/core/html/canvas/CanvasStyle.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
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& color, ExceptionSta te& 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 RGBA32 rgba = 0;
55 if (!parseColorOrCurrentColor(rgba, color, 0 /*canvas*/)) { 55 if (!parseColorOrCurrentColor(rgba, color, 0 /*canvas*/)) {
56 exceptionState.throwDOMException(SyntaxError, "The value provided ('" + color + "') could not be parsed as a color."); 56 exceptionState.ThrowDOMException(SyntaxError, "The value provided ('" + color + "') 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(rgba));
61 } 61 }
62 62
63 } // namespace 63 } // namespace
OLDNEW
« no previous file with comments | « sky/engine/core/html/canvas/CanvasGradient.h ('k') | sky/engine/core/html/canvas/CanvasPathMethods.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698