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

Unified Diff: src/gpu/GrBlurUtils.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/gpu/GrBatchFontCache.cpp ('k') | src/gpu/GrBufferedDrawTarget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrBlurUtils.cpp
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index ede386afb20b73de4dedaa8aaf3eb053cb7e4e26..a6eeae6f6bd803e36a8342665a1b5c0aaf354c12 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -66,7 +66,7 @@ static bool draw_with_mask_filter(GrDrawContext* drawContext,
}
SkAutoMaskFreeImage autoSrc(srcM.fImage);
- if (!filter->filterMask(&dstM, srcM, viewMatrix, NULL)) {
+ if (!filter->filterMask(&dstM, srcM, viewMatrix, nullptr)) {
return false;
}
// this will free-up dstM when we're done (allocated in filterMask())
@@ -116,18 +116,18 @@ static GrTexture* create_mask_GPU(GrContext* context,
}
GrTexture* mask = context->textureProvider()->createApproxTexture(desc);
- if (NULL == mask) {
- return NULL;
+ if (nullptr == mask) {
+ return nullptr;
}
SkRect clipRect = SkRect::MakeWH(maskRect.width(), maskRect.height());
GrDrawContext* drawContext = context->drawContext();
if (!drawContext) {
- return NULL;
+ return nullptr;
}
- drawContext->clear(mask->asRenderTarget(), NULL, 0x0, true);
+ drawContext->clear(mask->asRenderTarget(), nullptr, 0x0, true);
GrPaint tempPaint;
tempPaint.setAntiAlias(doAA);
@@ -170,7 +170,7 @@ void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
if (prePathMatrix) {
// stroking, path effects, and blurs are supposed to be applied *after* the prePathMatrix.
// The pre-path-matrix also should not affect shading.
- if (NULL == paint.getMaskFilter() && NULL == pathEffect && NULL == paint.getShader() &&
+ if (nullptr == paint.getMaskFilter() && nullptr == pathEffect && nullptr == paint.getShader() &&
(strokeInfo.isFillStyle() || strokeInfo.isHairlineStyle())) {
viewMatrix.preConcat(*prePathMatrix);
} else {
@@ -195,7 +195,7 @@ void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
return;
}
- const SkRect* cullRect = NULL; // TODO: what is our bounds?
+ const SkRect* cullRect = nullptr; // TODO: what is our bounds?
if (!strokeInfo.isDashed() && pathEffect && pathEffect->filterPath(effectPath.init(), *pathPtr,
&strokeInfo, cullRect)) {
pathPtr = effectPath.get();
« no previous file with comments | « src/gpu/GrBatchFontCache.cpp ('k') | src/gpu/GrBufferedDrawTarget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698