diff options
author | halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /tests/WritePixelsTest.cpp | |
parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'tests/WritePixelsTest.cpp')
-rw-r--r-- | tests/WritePixelsTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp index a06130e36b..c4010b7119 100644 --- a/tests/WritePixelsTest.cpp +++ b/tests/WritePixelsTest.cpp @@ -200,7 +200,7 @@ static bool check_write(skiatest::Reporter* reporter, SkCanvas* canvas, const Sk canvasRowBytes = secretDevBitmap.rowBytes(); canvasPixels = static_cast<const uint32_t*>(secretDevBitmap.getPixels()); - if (NULL == canvasPixels) { + if (nullptr == canvasPixels) { return false; } @@ -286,7 +286,7 @@ static bool alloc_row_bytes(SkBitmap* bm, const SkImageInfo& info, size_t rowByt if (!bm->setInfo(info, rowBytes)) { return false; } - SkPixelRef* pr = SkMallocPixelRef::NewAllocate(info, rowBytes, NULL); + SkPixelRef* pr = SkMallocPixelRef::NewAllocate(info, rowBytes, nullptr); bm->setPixelRef(pr)->unref(); return true; } @@ -306,7 +306,7 @@ static SkSurface* create_surface(const CanvasConfig& c, GrContext* grCtx) { if (!c.fTightRowBytes) { memset(pixels, DEV_PAD, size); } - return SkSurface::NewRasterDirectReleaseProc(info, pixels, rowBytes, free_pixels, NULL); + return SkSurface::NewRasterDirectReleaseProc(info, pixels, rowBytes, free_pixels, nullptr); } #if SK_SUPPORT_GPU case kGpu_BottomLeft_DevType: @@ -322,7 +322,7 @@ static SkSurface* create_surface(const CanvasConfig& c, GrContext* grCtx) { return SkSurface::NewRenderTargetDirect(texture->asRenderTarget()); #endif } - return NULL; + return nullptr; } static bool setup_bitmap(SkBitmap* bm, SkColorType ct, SkAlphaType at, int w, int h, int tightRB) { @@ -417,7 +417,7 @@ DEF_GPUTEST(WritePixels, reporter, factory) { } #endif for (int glCtxType = 0; glCtxType < glCtxTypeCnt; ++glCtxType) { - GrContext* context = NULL; + GrContext* context = nullptr; #if SK_SUPPORT_GPU if (isGPUDevice) { GrContextFactory::GLContextType type = @@ -426,7 +426,7 @@ DEF_GPUTEST(WritePixels, reporter, factory) { continue; } context = factory->get(type); - if (NULL == context) { + if (nullptr == context) { continue; } } |