| Index: tests/SkpSkGrTest.cpp
|
| diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp
|
| index 23cd30c0c1b86b80c0c31aa5a79b0c99dadd54f2..98c54e032cddb9e6941c846d8a513bfe43819b47 100644
|
| --- a/tests/SkpSkGrTest.cpp
|
| +++ b/tests/SkpSkGrTest.cpp
|
| @@ -382,7 +382,7 @@ static void writePict(const SkBitmap& bitmap, const char* outDir, const char* pn
|
| }
|
|
|
| void TestResult::testOne() {
|
| - SkPicture* pic = NULL;
|
| + SkPicture* pic = nullptr;
|
| {
|
| SkString d;
|
| d.printf(" {%d, \"%s\"},", fDirNo, fFilename);
|
| @@ -417,7 +417,7 @@ void TestResult::testOne() {
|
| #else
|
| GrContext* context = contextFactory.get(kNative);
|
| #endif
|
| - if (NULL == context) {
|
| + if (nullptr == context) {
|
| SkDebugf("unable to allocate context for %s\n", fFilename);
|
| goto finish;
|
| }
|
| @@ -450,7 +450,7 @@ void TestResult::testOne() {
|
| desc.fWidth = dim.fX;
|
| desc.fHeight = dim.fY;
|
| desc.fSampleCnt = 0;
|
| - SkAutoTUnref<GrTexture> texture(context->createUncachedTexture(desc, NULL, 0));
|
| + SkAutoTUnref<GrTexture> texture(context->createUncachedTexture(desc, nullptr, 0));
|
| if (!texture) {
|
| SkDebugf("unable to allocate texture for %s (w=%d h=%d)\n", fFilename,
|
| dim.fX, dim.fY);
|
|
|