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

Side by Side Diff: gm/gradient_matrix.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 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 unified diff | Download patch
« no previous file with comments | « gm/gradientDirtyLaundry.cpp ('k') | gm/gradients.cpp » ('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 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkCanvas.h" 8 #include "SkCanvas.h"
9 #include "SkColor.h" 9 #include "SkColor.h"
10 #include "SkGradientShader.h" 10 #include "SkGradientShader.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 {{sZero, sOne}, {sOne, sZero}} 55 {{sZero, sOne}, {sOne, sZero}}
56 }; 56 };
57 57
58 // These define the pixels allocated to each gradient image. 58 // These define the pixels allocated to each gradient image.
59 static const SkScalar TESTGRID_X = SkIntToScalar(200); 59 static const SkScalar TESTGRID_X = SkIntToScalar(200);
60 static const SkScalar TESTGRID_Y = SkIntToScalar(200); 60 static const SkScalar TESTGRID_Y = SkIntToScalar(200);
61 61
62 static const int IMAGES_X = 4; // number of images per row 62 static const int IMAGES_X = 4; // number of images per row
63 63
64 static SkShader* make_linear_gradient(const SkPoint pts[2], const SkMatrix& loca lMatrix) { 64 static SkShader* make_linear_gradient(const SkPoint pts[2], const SkMatrix& loca lMatrix) {
65 return SkGradientShader::CreateLinear(pts, gColors, NULL, SK_ARRAY_COUNT(gCo lors), 65 return SkGradientShader::CreateLinear(pts, gColors, nullptr, SK_ARRAY_COUNT( gColors),
66 SkShader::kClamp_TileMode, 0, &localMa trix); 66 SkShader::kClamp_TileMode, 0, &localMa trix);
67 } 67 }
68 68
69 static SkShader* make_radial_gradient(const SkPoint pts[2], const SkMatrix& loca lMatrix) { 69 static SkShader* make_radial_gradient(const SkPoint pts[2], const SkMatrix& loca lMatrix) {
70 SkPoint center; 70 SkPoint center;
71 center.set(SkScalarAve(pts[0].fX, pts[1].fX), 71 center.set(SkScalarAve(pts[0].fX, pts[1].fX),
72 SkScalarAve(pts[0].fY, pts[1].fY)); 72 SkScalarAve(pts[0].fY, pts[1].fY));
73 float radius = (center - pts[0]).length(); 73 float radius = (center - pts[0]).length();
74 return SkGradientShader::CreateRadial(center, radius, gColors, NULL, SK_ARRA Y_COUNT(gColors), 74 return SkGradientShader::CreateRadial(center, radius, gColors, nullptr, SK_A RRAY_COUNT(gColors),
75 SkShader::kClamp_TileMode, 0, &localMa trix); 75 SkShader::kClamp_TileMode, 0, &localMa trix);
76 } 76 }
77 77
78 static void draw_gradients(SkCanvas* canvas, 78 static void draw_gradients(SkCanvas* canvas,
79 SkShader* (*makeShader)(const SkPoint[2], const SkMat rix&), 79 SkShader* (*makeShader)(const SkPoint[2], const SkMat rix&),
80 const SkPoint ptsArray[][2], int numImages) { 80 const SkPoint ptsArray[][2], int numImages) {
81 // Use some nice prime numbers for the rectangle and matrix with 81 // Use some nice prime numbers for the rectangle and matrix with
82 // different scaling along the x and y axes (which is the bug this 82 // different scaling along the x and y axes (which is the bug this
83 // test addresses, where incorrect order of operations mixed up the axes) 83 // test addresses, where incorrect order of operations mixed up the axes)
84 SkRect rectGrad = { 84 SkRect rectGrad = {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 draw_gradients(canvas, &make_radial_gradient, 138 draw_gradients(canvas, &make_radial_gradient,
139 radialPts, SK_ARRAY_COUNT(radialPts)); 139 radialPts, SK_ARRAY_COUNT(radialPts));
140 } 140 }
141 141
142 private: 142 private:
143 typedef GM INHERITED; 143 typedef GM INHERITED;
144 }; 144 };
145 145
146 DEF_GM( return new GradientMatrixGM; ) 146 DEF_GM( return new GradientMatrixGM; )
147 } 147 }
OLDNEW
« no previous file with comments | « gm/gradientDirtyLaundry.cpp ('k') | gm/gradients.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698