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

Side by Side Diff: gm/coloremoji.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/colorcube.cpp ('k') | gm/colorfilterimagefilter.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 "gm.h" 8 #include "gm.h"
9 9
10 #include "Resources.h" 10 #include "Resources.h"
11 #include "SkBlurImageFilter.h" 11 #include "SkBlurImageFilter.h"
12 #include "SkColorFilterImageFilter.h" 12 #include "SkColorFilterImageFilter.h"
13 #include "SkColorMatrixFilter.h" 13 #include "SkColorMatrixFilter.h"
14 #include "SkCanvas.h" 14 #include "SkCanvas.h"
15 #include "SkGradientShader.h" 15 #include "SkGradientShader.h"
16 #include "SkStream.h" 16 #include "SkStream.h"
17 #include "SkTypeface.h" 17 #include "SkTypeface.h"
18 18
19 /* 19 /*
20 * Spits out a dummy gradient to test blur with shader on paint 20 * Spits out a dummy gradient to test blur with shader on paint
21 */ 21 */
22 static SkShader* MakeLinear() { 22 static SkShader* MakeLinear() {
23 static const SkPoint kPts[] = { { 0, 0 }, { 32, 32 } }; 23 static const SkPoint kPts[] = { { 0, 0 }, { 32, 32 } };
24 static const SkScalar kPos[] = { 0, SK_Scalar1/2, SK_Scalar1 }; 24 static const SkScalar kPos[] = { 0, SK_Scalar1/2, SK_Scalar1 };
25 static const SkColor kColors[] = {0x80F00080, 0xF0F08000, 0x800080F0 }; 25 static const SkColor kColors[] = {0x80F00080, 0xF0F08000, 0x800080F0 };
26 return SkGradientShader::CreateLinear(kPts, kColors, kPos, 26 return SkGradientShader::CreateLinear(kPts, kColors, kPos,
27 SK_ARRAY_COUNT(kColors), SkShader::kCl amp_TileMode); 27 SK_ARRAY_COUNT(kColors), SkShader::kCl amp_TileMode);
28 } 28 }
29 29
30 static SkImageFilter* make_grayscale(SkImageFilter* input = NULL) { 30 static SkImageFilter* make_grayscale(SkImageFilter* input = nullptr) {
31 SkScalar matrix[20]; 31 SkScalar matrix[20];
32 memset(matrix, 0, 20 * sizeof(SkScalar)); 32 memset(matrix, 0, 20 * sizeof(SkScalar));
33 matrix[0] = matrix[5] = matrix[10] = 0.2126f; 33 matrix[0] = matrix[5] = matrix[10] = 0.2126f;
34 matrix[1] = matrix[6] = matrix[11] = 0.7152f; 34 matrix[1] = matrix[6] = matrix[11] = 0.7152f;
35 matrix[2] = matrix[7] = matrix[12] = 0.0722f; 35 matrix[2] = matrix[7] = matrix[12] = 0.0722f;
36 matrix[18] = 1.0f; 36 matrix[18] = 1.0f;
37 SkAutoTUnref<SkColorFilter> filter(SkColorMatrixFilter::Create(matrix)); 37 SkAutoTUnref<SkColorFilter> filter(SkColorMatrixFilter::Create(matrix));
38 return SkColorFilterImageFilter::Create(filter, input); 38 return SkColorFilterImageFilter::Create(filter, input);
39 } 39 }
40 40
41 static SkImageFilter* make_blur(float amount, SkImageFilter* input = NULL) { 41 static SkImageFilter* make_blur(float amount, SkImageFilter* input = nullptr) {
42 return SkBlurImageFilter::Create(amount, amount, input); 42 return SkBlurImageFilter::Create(amount, amount, input);
43 } 43 }
44 44
45 namespace skiagm { 45 namespace skiagm {
46 46
47 class ColorEmojiGM : public GM { 47 class ColorEmojiGM : public GM {
48 public: 48 public:
49 ColorEmojiGM() { } 49 ColorEmojiGM() { }
50 50
51 protected: 51 protected:
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 for (int makeLinear = 0; makeLinear < 2; makeLinear++) { 91 for (int makeLinear = 0; makeLinear < 2; makeLinear++) {
92 for (int makeBlur = 0; makeBlur < 2; makeBlur++) { 92 for (int makeBlur = 0; makeBlur < 2; makeBlur++) {
93 for (int makeGray = 0; makeGray < 2; makeGray++) { 93 for (int makeGray = 0; makeGray < 2; makeGray++) {
94 SkPaint shaderPaint; 94 SkPaint shaderPaint;
95 shaderPaint.setTypeface(paint.getTypeface()); 95 shaderPaint.setTypeface(paint.getTypeface());
96 if (SkToBool(makeLinear)) { 96 if (SkToBool(makeLinear)) {
97 shaderPaint.setShader(MakeLinear())->unref(); 97 shaderPaint.setShader(MakeLinear())->unref();
98 } 98 }
99 99
100 if (SkToBool(makeBlur) && SkToBool(makeGray)) { 100 if (SkToBool(makeBlur) && SkToBool(makeGray)) {
101 SkAutoTUnref<SkImageFilter> grayScale(make_grayscale(NUL L)); 101 SkAutoTUnref<SkImageFilter> grayScale(make_grayscale(nul lptr));
102 SkAutoTUnref<SkImageFilter> blur(make_blur(3.0f, graySca le)); 102 SkAutoTUnref<SkImageFilter> blur(make_blur(3.0f, graySca le));
103 shaderPaint.setImageFilter(blur); 103 shaderPaint.setImageFilter(blur);
104 } else if (SkToBool(makeBlur)) { 104 } else if (SkToBool(makeBlur)) {
105 SkAutoTUnref<SkImageFilter> blur(make_blur(3.0f, NULL)); 105 SkAutoTUnref<SkImageFilter> blur(make_blur(3.0f, nullptr ));
106 shaderPaint.setImageFilter(blur); 106 shaderPaint.setImageFilter(blur);
107 } else if (SkToBool(makeGray)) { 107 } else if (SkToBool(makeGray)) {
108 SkAutoTUnref<SkImageFilter> grayScale(make_grayscale(NUL L)); 108 SkAutoTUnref<SkImageFilter> grayScale(make_grayscale(nul lptr));
109 shaderPaint.setImageFilter(grayScale); 109 shaderPaint.setImageFilter(grayScale);
110 } 110 }
111 shaderPaint.setTextSize(30); 111 shaderPaint.setTextSize(30);
112 canvas->drawText(text, strlen(text), 380, SkIntToScalar(y_of fset), 112 canvas->drawText(text, strlen(text), 380, SkIntToScalar(y_of fset),
113 shaderPaint); 113 shaderPaint);
114 y_offset += 32; 114 y_offset += 32;
115 } 115 }
116 } 116 }
117 } 117 }
118 118
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 157
158 typedef GM INHERITED; 158 typedef GM INHERITED;
159 }; 159 };
160 160
161 ////////////////////////////////////////////////////////////////////////////// 161 //////////////////////////////////////////////////////////////////////////////
162 162
163 static GM* MyFactory(void*) { return new ColorEmojiGM; } 163 static GM* MyFactory(void*) { return new ColorEmojiGM; }
164 static GMRegistry reg(MyFactory); 164 static GMRegistry reg(MyFactory);
165 165
166 } 166 }
OLDNEW
« no previous file with comments | « gm/colorcube.cpp ('k') | gm/colorfilterimagefilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698