Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(948)

Unified Diff: src/effects/SkGpuBlurUtils.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/effects/SkEmbossMaskFilter.cpp ('k') | src/effects/SkLayerDrawLooper.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkGpuBlurUtils.cpp
diff --git a/src/effects/SkGpuBlurUtils.cpp b/src/effects/SkGpuBlurUtils.cpp
index 2b6b310819eb0110eb9c230f66c0d19a298f006e..8b0e5fb7994a4aec253f9cdebe6ad72cf428ee69 100644
--- a/src/effects/SkGpuBlurUtils.cpp
+++ b/src/effects/SkGpuBlurUtils.cpp
@@ -192,11 +192,11 @@ GrTexture* GaussianBlur(GrContext* context,
tempTexture = temp2.get();
}
- if (NULL == dstTexture || NULL == tempTexture) {
- return NULL;
+ if (nullptr == dstTexture || nullptr == tempTexture) {
+ return nullptr;
}
- GrDrawContext* srcDrawContext = NULL;
+ GrDrawContext* srcDrawContext = nullptr;
for (int i = 1; i < scaleFactorX || i < scaleFactorY; i *= 2) {
GrPaint paint;
@@ -226,7 +226,7 @@ GrTexture* GaussianBlur(GrContext* context,
GrDrawContext* dstDrawContext = context->drawContext();
if (!dstDrawContext) {
- return NULL;
+ return nullptr;
}
dstDrawContext->drawNonAARectToRect(dstTexture->asRenderTarget(), clip, paint,
SkMatrix::I(), dstRect, srcRect);
@@ -249,7 +249,7 @@ GrTexture* GaussianBlur(GrContext* context,
GrDrawContext* dstDrawContext = context->drawContext();
if (!dstDrawContext) {
- return NULL;
+ return nullptr;
}
convolve_gaussian_2d(dstDrawContext, dstTexture->asRenderTarget(), clip, srcRect, dstRect,
srcTexture, radiusX, radiusY, sigmaX, sigmaY, cropToRect, srcIRect);
@@ -266,7 +266,7 @@ GrTexture* GaussianBlur(GrContext* context,
if (!srcDrawContext) {
srcDrawContext = context->drawContext();
if (!srcDrawContext) {
- return NULL;
+ return nullptr;
}
}
@@ -280,7 +280,7 @@ GrTexture* GaussianBlur(GrContext* context,
GrDrawContext* dstDrawContext = context->drawContext();
if (!dstDrawContext) {
- return NULL;
+ return nullptr;
}
convolve_gaussian(dstDrawContext, dstTexture->asRenderTarget(), clip, srcRect, dstRect,
srcTexture, Gr1DKernelEffect::kX_Direction, radiusX, sigmaX,
@@ -298,7 +298,7 @@ GrTexture* GaussianBlur(GrContext* context,
if (!srcDrawContext) {
srcDrawContext = context->drawContext();
if (!srcDrawContext) {
- return NULL;
+ return nullptr;
}
}
@@ -313,7 +313,7 @@ GrTexture* GaussianBlur(GrContext* context,
GrDrawContext* dstDrawContext = context->drawContext();
if (!dstDrawContext) {
- return NULL;
+ return nullptr;
}
convolve_gaussian(dstDrawContext, dstTexture->asRenderTarget(), clip, srcRect,
dstRect, srcTexture, Gr1DKernelEffect::kY_Direction, radiusY, sigmaY,
@@ -350,7 +350,7 @@ GrTexture* GaussianBlur(GrContext* context,
GrDrawContext* dstDrawContext = context->drawContext();
if (!dstDrawContext) {
- return NULL;
+ return nullptr;
}
dstDrawContext->drawNonAARectToRect(dstTexture->asRenderTarget(), clip, paint,
SkMatrix::I(), dstRect, srcRect);
« no previous file with comments | « src/effects/SkEmbossMaskFilter.cpp ('k') | src/effects/SkLayerDrawLooper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698