| Index: gm/texturedomaineffect.cpp
|
| diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
|
| index eb0f2cc944e043c29c3f316239383d1b9cc5fd2a..facfb7a792570efca59edc50a86cc3d680fd65a4 100644
|
| --- a/gm/texturedomaineffect.cpp
|
| +++ b/gm/texturedomaineffect.cpp
|
| @@ -49,19 +49,19 @@ protected:
|
|
|
| SkColor colors1[] = { SK_ColorCYAN, SK_ColorLTGRAY, SK_ColorGRAY };
|
| paint.setShader(SkGradientShader::CreateSweep(65.f, 75.f, colors1,
|
| - NULL, SK_ARRAY_COUNT(colors1)))->unref();
|
| + nullptr, SK_ARRAY_COUNT(colors1)))->unref();
|
| canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f,
|
| fBmp.width() + 10.f, fBmp.height() + 10.f), paint);
|
|
|
| SkColor colors2[] = { SK_ColorMAGENTA, SK_ColorLTGRAY, SK_ColorYELLOW };
|
| - paint.setShader(SkGradientShader::CreateSweep(45.f, 55.f, colors2, NULL,
|
| + paint.setShader(SkGradientShader::CreateSweep(45.f, 55.f, colors2, nullptr,
|
| SK_ARRAY_COUNT(colors2)))->unref();
|
| paint.setXfermodeMode(SkXfermode::kDarken_Mode);
|
| canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f,
|
| fBmp.width() + 10.f, fBmp.height() + 10.f), paint);
|
|
|
| SkColor colors3[] = { SK_ColorBLUE, SK_ColorLTGRAY, SK_ColorGREEN };
|
| - paint.setShader(SkGradientShader::CreateSweep(25.f, 35.f, colors3, NULL,
|
| + paint.setShader(SkGradientShader::CreateSweep(25.f, 35.f, colors3, nullptr,
|
| SK_ARRAY_COUNT(colors3)))->unref();
|
| paint.setXfermodeMode(SkXfermode::kLighten_Mode);
|
| canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f,
|
| @@ -70,23 +70,23 @@ protected:
|
|
|
| void onDraw(SkCanvas* canvas) override {
|
| GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
|
| - if (NULL == rt) {
|
| + if (nullptr == rt) {
|
| return;
|
| }
|
| GrContext* context = rt->getContext();
|
| - if (NULL == context) {
|
| + if (nullptr == context) {
|
| this->drawGpuOnlyMessage(canvas);
|
| return;
|
| }
|
|
|
| GrTestTarget tt;
|
| context->getTestTarget(&tt);
|
| - if (NULL == tt.target()) {
|
| + if (nullptr == tt.target()) {
|
| SkDEBUGFAIL("Couldn't get Gr test target.");
|
| return;
|
| }
|
|
|
| - SkAutoTUnref<GrTexture> texture(GrRefCachedBitmapTexture(context, fBmp, NULL));
|
| + SkAutoTUnref<GrTexture> texture(GrRefCachedBitmapTexture(context, fBmp, nullptr));
|
| if (!texture) {
|
| return;
|
| }
|
|
|