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

Side by Side Diff: gm/texturedomaineffect.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/texteffects.cpp ('k') | gm/tileimagefilter.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 /* 2 /*
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 // This test only works with the GPU backend. 9 // This test only works with the GPU backend.
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 } 42 }
43 43
44 void onOnceBeforeDraw() override { 44 void onOnceBeforeDraw() override {
45 fBmp.allocN32Pixels(kTargetWidth, kTargetHeight); 45 fBmp.allocN32Pixels(kTargetWidth, kTargetHeight);
46 SkCanvas canvas(fBmp); 46 SkCanvas canvas(fBmp);
47 canvas.clear(0x00000000); 47 canvas.clear(0x00000000);
48 SkPaint paint; 48 SkPaint paint;
49 49
50 SkColor colors1[] = { SK_ColorCYAN, SK_ColorLTGRAY, SK_ColorGRAY }; 50 SkColor colors1[] = { SK_ColorCYAN, SK_ColorLTGRAY, SK_ColorGRAY };
51 paint.setShader(SkGradientShader::CreateSweep(65.f, 75.f, colors1, 51 paint.setShader(SkGradientShader::CreateSweep(65.f, 75.f, colors1,
52 NULL, SK_ARRAY_COUNT(color s1)))->unref(); 52 nullptr, SK_ARRAY_COUNT(co lors1)))->unref();
53 canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f, 53 canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f,
54 fBmp.width() + 10.f, fBmp.height() + 10 .f), paint); 54 fBmp.width() + 10.f, fBmp.height() + 10 .f), paint);
55 55
56 SkColor colors2[] = { SK_ColorMAGENTA, SK_ColorLTGRAY, SK_ColorYELLOW }; 56 SkColor colors2[] = { SK_ColorMAGENTA, SK_ColorLTGRAY, SK_ColorYELLOW };
57 paint.setShader(SkGradientShader::CreateSweep(45.f, 55.f, colors2, NULL, 57 paint.setShader(SkGradientShader::CreateSweep(45.f, 55.f, colors2, nullp tr,
58 SK_ARRAY_COUNT(colors2)))- >unref(); 58 SK_ARRAY_COUNT(colors2)))- >unref();
59 paint.setXfermodeMode(SkXfermode::kDarken_Mode); 59 paint.setXfermodeMode(SkXfermode::kDarken_Mode);
60 canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f, 60 canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f,
61 fBmp.width() + 10.f, fBmp.height() + 10 .f), paint); 61 fBmp.width() + 10.f, fBmp.height() + 10 .f), paint);
62 62
63 SkColor colors3[] = { SK_ColorBLUE, SK_ColorLTGRAY, SK_ColorGREEN }; 63 SkColor colors3[] = { SK_ColorBLUE, SK_ColorLTGRAY, SK_ColorGREEN };
64 paint.setShader(SkGradientShader::CreateSweep(25.f, 35.f, colors3, NULL, 64 paint.setShader(SkGradientShader::CreateSweep(25.f, 35.f, colors3, nullp tr,
65 SK_ARRAY_COUNT(colors3)))- >unref(); 65 SK_ARRAY_COUNT(colors3)))- >unref();
66 paint.setXfermodeMode(SkXfermode::kLighten_Mode); 66 paint.setXfermodeMode(SkXfermode::kLighten_Mode);
67 canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f, 67 canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f,
68 fBmp.width() + 10.f, fBmp.height() + 10 .f), paint); 68 fBmp.width() + 10.f, fBmp.height() + 10 .f), paint);
69 } 69 }
70 70
71 void onDraw(SkCanvas* canvas) override { 71 void onDraw(SkCanvas* canvas) override {
72 GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget (); 72 GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget ();
73 if (NULL == rt) { 73 if (nullptr == rt) {
74 return; 74 return;
75 } 75 }
76 GrContext* context = rt->getContext(); 76 GrContext* context = rt->getContext();
77 if (NULL == context) { 77 if (nullptr == context) {
78 this->drawGpuOnlyMessage(canvas); 78 this->drawGpuOnlyMessage(canvas);
79 return; 79 return;
80 } 80 }
81 81
82 GrTestTarget tt; 82 GrTestTarget tt;
83 context->getTestTarget(&tt); 83 context->getTestTarget(&tt);
84 if (NULL == tt.target()) { 84 if (nullptr == tt.target()) {
85 SkDEBUGFAIL("Couldn't get Gr test target."); 85 SkDEBUGFAIL("Couldn't get Gr test target.");
86 return; 86 return;
87 } 87 }
88 88
89 SkAutoTUnref<GrTexture> texture(GrRefCachedBitmapTexture(context, fBmp, NULL)); 89 SkAutoTUnref<GrTexture> texture(GrRefCachedBitmapTexture(context, fBmp, nullptr));
90 if (!texture) { 90 if (!texture) {
91 return; 91 return;
92 } 92 }
93 93
94 SkTArray<SkMatrix> textureMatrices; 94 SkTArray<SkMatrix> textureMatrices;
95 textureMatrices.push_back().setIDiv(texture->width(), texture->height()) ; 95 textureMatrices.push_back().setIDiv(texture->width(), texture->height()) ;
96 textureMatrices.push_back() = textureMatrices[0]; 96 textureMatrices.push_back() = textureMatrices[0];
97 textureMatrices.back().postScale(1.5f, 0.85f); 97 textureMatrices.back().postScale(1.5f, 0.85f);
98 textureMatrices.push_back() = textureMatrices[0]; 98 textureMatrices.push_back() = textureMatrices[0];
99 textureMatrices.back().preRotate(45.f, texture->width() / 2.f, texture-> height() / 2.f); 99 textureMatrices.back().preRotate(45.f, texture->width() / 2.f, texture-> height() / 2.f);
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 }; 152 };
153 153
154 // Windows builds did not like SkScalar initialization in class :( 154 // Windows builds did not like SkScalar initialization in class :(
155 const SkScalar TextureDomainEffect::kDrawPad = 10.f; 155 const SkScalar TextureDomainEffect::kDrawPad = 10.f;
156 const SkScalar TextureDomainEffect::kTestPad = 10.f; 156 const SkScalar TextureDomainEffect::kTestPad = 10.f;
157 157
158 DEF_GM(return new TextureDomainEffect;) 158 DEF_GM(return new TextureDomainEffect;)
159 } 159 }
160 160
161 #endif 161 #endif
OLDNEW
« no previous file with comments | « gm/texteffects.cpp ('k') | gm/tileimagefilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698