| Index: src/effects/SkXfermodeImageFilter.cpp
|
| diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
|
| index f62773a250974e38a6c0546377d49767d1b6bfba..7c4a94b949969f4f58166d84ed7e23443d9e2f74 100644
|
| --- a/src/effects/SkXfermodeImageFilter.cpp
|
| +++ b/src/effects/SkXfermodeImageFilter.cpp
|
| @@ -77,7 +77,7 @@ bool SkXfermodeImageFilter::onFilterImage(Proxy* proxy,
|
| }
|
|
|
| SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
|
| - if (NULL == device.get()) {
|
| + if (nullptr == device.get()) {
|
| return false;
|
| }
|
| SkCanvas canvas(device);
|
| @@ -123,7 +123,7 @@ void SkXfermodeImageFilter::toString(SkString* str) const {
|
| #if SK_SUPPORT_GPU
|
|
|
| bool SkXfermodeImageFilter::canFilterImageGPU() const {
|
| - return fMode && fMode->asFragmentProcessor(NULL, NULL, NULL) && !cropRectIsSet();
|
| + return fMode && fMode->asFragmentProcessor(nullptr, nullptr, nullptr) && !cropRectIsSet();
|
| }
|
|
|
| bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy,
|
| @@ -139,7 +139,7 @@ bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy,
|
| }
|
|
|
| GrTexture* backgroundTex = background.getTexture();
|
| - if (NULL == backgroundTex) {
|
| + if (nullptr == backgroundTex) {
|
| SkASSERT(false);
|
| return false;
|
| }
|
| @@ -153,7 +153,7 @@ bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy,
|
| GrTexture* foregroundTex = foreground.getTexture();
|
| GrContext* context = foregroundTex->getContext();
|
|
|
| - GrFragmentProcessor* xferProcessor = NULL;
|
| + GrFragmentProcessor* xferProcessor = nullptr;
|
|
|
| GrSurfaceDesc desc;
|
| desc.fFlags = kRenderTarget_GrSurfaceFlag;
|
|
|