| Index: gm/colortypexfermode.cpp
|
| diff --git a/gm/colortypexfermode.cpp b/gm/colortypexfermode.cpp
|
| index 2926523c27eaf09baa800cbfa608bb83d4a493fb..55d7697e3593ef68249be025b271bdbda7ce2901 100644
|
| --- a/gm/colortypexfermode.cpp
|
| +++ b/gm/colortypexfermode.cpp
|
| @@ -20,7 +20,7 @@ public:
|
| const static int W = 64;
|
| const static int H = 64;
|
| ColorTypeXfermodeGM()
|
| - : fColorType(NULL) {
|
| + : fColorType(nullptr) {
|
| }
|
|
|
| virtual ~ColorTypeXfermodeGM() {
|
| @@ -35,7 +35,7 @@ protected:
|
| };
|
| SkMatrix local;
|
| local.setRotate(180);
|
| - SkShader* s = SkGradientShader::CreateSweep(0,0, colors, NULL,
|
| + SkShader* s = SkGradientShader::CreateSweep(0,0, colors, nullptr,
|
| SK_ARRAY_COUNT(colors), 0, &local);
|
|
|
| SkPaint paint;
|
| @@ -44,7 +44,7 @@ protected:
|
|
|
| SkTypeface* orig = sk_tool_utils::create_portable_typeface("serif",
|
| SkTypeface::kBold);
|
| - if (NULL == orig) {
|
| + if (nullptr == orig) {
|
| orig = SkTypeface::RefDefault();
|
| }
|
| fColorType = new SkGTypeface(orig, paint);
|
| @@ -138,7 +138,7 @@ protected:
|
|
|
| r.inset(-SK_ScalarHalf, -SK_ScalarHalf);
|
| p.setStyle(SkPaint::kStroke_Style);
|
| - p.setShader(NULL);
|
| + p.setShader(nullptr);
|
| canvas->drawRect(r, p);
|
|
|
| textP.setXfermode(mode);
|
|
|