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 /src/core/SkBitmapProcShader.cpp | |
parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
download | platform_external_skqp-96fcdcc219d2a0d3579719b84b28bede76efba64.tar.gz platform_external_skqp-96fcdcc219d2a0d3579719b84b28bede76efba64.tar.bz2 platform_external_skqp-96fcdcc219d2a0d3579719b84b28bede76efba64.zip |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/core/SkBitmapProcShader.cpp')
-rw-r--r-- | src/core/SkBitmapProcShader.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp index ef9cfd4dc8..e382d09c99 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/core/SkBitmapProcShader.cpp @@ -47,7 +47,7 @@ SkFlattenable* SkBitmapProcShader::CreateProc(SkReadBuffer& buffer) { buffer.readMatrix(&lm); SkBitmap bm; if (!buffer.readBitmap(&bm)) { - return NULL; + return nullptr; } bm.setImmutable(); TileMode mx = (TileMode)buffer.readUInt(); @@ -75,7 +75,7 @@ SkShader::Context* SkBitmapProcShader::onCreateContext(const ContextRec& rec, vo SkMatrix totalInverse; // Do this first, so we know the matrix can be inverted. if (!this->computeTotalInverse(rec, &totalInverse)) { - return NULL; + return nullptr; } void* stateStorage = (char*)storage + sizeof(BitmapProcShaderContext); @@ -87,7 +87,7 @@ SkShader::Context* SkBitmapProcShader::onCreateContext(const ContextRec& rec, vo state->fOrigBitmap = fRawBitmap; if (!state->chooseProcs(totalInverse, *rec.fPaint)) { state->~SkBitmapProcState(); - return NULL; + return nullptr; } return new (storage) BitmapProcShaderContext(*this, rec, state); @@ -212,7 +212,7 @@ SkShader::Context::ShadeProc SkBitmapProcShader::BitmapProcShaderContext::asASha *ctx = fState; return (ShadeProc)fState->getShaderProc32(); } - return NULL; + return nullptr; } void SkBitmapProcShader::BitmapProcShaderContext::shadeSpan16(int x, int y, uint16_t dstC[], @@ -301,19 +301,19 @@ SkShader* SkCreateBitmapShader(const SkBitmap& src, SkShader::TileMode tmx, SkShader* shader; SkColor color; if (src.isNull() || bitmap_is_too_big(src)) { - if (NULL == allocator) { + if (nullptr == allocator) { shader = new SkEmptyShader; } else { shader = allocator->createT<SkEmptyShader>(); } } else if (can_use_color_shader(src, &color)) { - if (NULL == allocator) { + if (nullptr == allocator) { shader = new SkColorShader(color); } else { shader = allocator->createT<SkColorShader>(color); } } else { - if (NULL == allocator) { + if (nullptr == allocator) { shader = new SkBitmapProcShader(src, tmx, tmy, localMatrix); } else { shader = allocator->createT<SkBitmapProcShader>(src, tmx, tmy, localMatrix); |