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

Side by Side Diff: Source/platform/graphics/Gradient.cpp

Issue 169283008: Maintain SkPaint in GraphicsContextState. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: A couple more optimizations. Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/platform/graphics/Gradient.h ('k') | Source/platform/graphics/GraphicsContext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2013 Google Inc. All rights reserved. 4 * Copyright (C) 2013 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 21 matching lines...) Expand all
32 #include "platform/graphics/Color.h" 32 #include "platform/graphics/Color.h"
33 #include "platform/graphics/GraphicsContext.h" 33 #include "platform/graphics/GraphicsContext.h"
34 #include "platform/graphics/skia/SkiaUtils.h" 34 #include "platform/graphics/skia/SkiaUtils.h"
35 #include "third_party/skia/include/core/SkColorShader.h" 35 #include "third_party/skia/include/core/SkColorShader.h"
36 #include "third_party/skia/include/core/SkShader.h" 36 #include "third_party/skia/include/core/SkShader.h"
37 #include "third_party/skia/include/effects/SkGradientShader.h" 37 #include "third_party/skia/include/effects/SkGradientShader.h"
38 38
39 namespace WebCore { 39 namespace WebCore {
40 40
41 Gradient::Gradient(const FloatPoint& p0, const FloatPoint& p1) 41 Gradient::Gradient(const FloatPoint& p0, const FloatPoint& p1)
42 : m_radial(false) 42 : m_p0(p0)
43 , m_p0(p0)
44 , m_p1(p1) 43 , m_p1(p1)
45 , m_r0(0) 44 , m_r0(0)
46 , m_r1(0) 45 , m_r1(0)
47 , m_aspectRatio(1) 46 , m_aspectRatio(1)
47 , m_radial(false)
48 , m_stopsSorted(false) 48 , m_stopsSorted(false)
49 , m_drawInPMColorSpace(false)
49 , m_spreadMethod(SpreadMethodPad) 50 , m_spreadMethod(SpreadMethodPad)
50 , m_drawInPMColorSpace(false)
51 { 51 {
52 } 52 }
53 53
54 Gradient::Gradient(const FloatPoint& p0, float r0, const FloatPoint& p1, float r 1, float aspectRatio) 54 Gradient::Gradient(const FloatPoint& p0, float r0, const FloatPoint& p1, float r 1, float aspectRatio)
55 : m_radial(true) 55 : m_p0(p0)
56 , m_p0(p0)
57 , m_p1(p1) 56 , m_p1(p1)
58 , m_r0(r0) 57 , m_r0(r0)
59 , m_r1(r1) 58 , m_r1(r1)
60 , m_aspectRatio(aspectRatio) 59 , m_aspectRatio(aspectRatio)
60 , m_radial(true)
61 , m_stopsSorted(false) 61 , m_stopsSorted(false)
62 , m_drawInPMColorSpace(false)
62 , m_spreadMethod(SpreadMethodPad) 63 , m_spreadMethod(SpreadMethodPad)
63 , m_drawInPMColorSpace(false)
64 { 64 {
65 } 65 }
66 66
67 Gradient::~Gradient() 67 Gradient::~Gradient()
68 { 68 {
69 } 69 }
70 70
71 void Gradient::addColorStop(float value, const Color& color) 71 void Gradient::addColorStop(float value, const Color& color)
72 { 72 {
73 float r; 73 float r;
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 if (!m_gradient) { 273 if (!m_gradient) {
274 // use last color, since our "geometry" was degenerate (e.g. radius==0) 274 // use last color, since our "geometry" was degenerate (e.g. radius==0)
275 m_gradient = adoptRef(new SkColorShader(colors[countUsed - 1])); 275 m_gradient = adoptRef(new SkColorShader(colors[countUsed - 1]));
276 } else { 276 } else {
277 m_gradient->setLocalMatrix(affineTransformToSkMatrix(m_gradientSpaceTran sformation)); 277 m_gradient->setLocalMatrix(affineTransformToSkMatrix(m_gradientSpaceTran sformation));
278 } 278 }
279 return m_gradient.get(); 279 return m_gradient.get();
280 } 280 }
281 281
282 } //namespace 282 } //namespace
OLDNEW
« no previous file with comments | « Source/platform/graphics/Gradient.h ('k') | Source/platform/graphics/GraphicsContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698