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

Unified Diff: src/effects/SkColorFilters.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/SkColorFilterImageFilter.cpp ('k') | src/effects/SkColorMatrixFilter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkColorFilters.cpp
diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
index 5560183153e7c4d2aed412646e0da091b37882df..c3fa730d006ca0e30020aa3c20c53cd49b762e80 100644
--- a/src/effects/SkColorFilters.cpp
+++ b/src/effects/SkColorFilters.cpp
@@ -132,7 +132,7 @@ public:
SkXfermode::Coeff srcCoeff, dstCoeff;
if (!SkXfermode::ModeAsCoeff(mode, &srcCoeff, &dstCoeff)) {
// SkDebugf("Failing to create color filter for mode %d\n", mode);
- return NULL;
+ return nullptr;
}
return new ModeColorFilterEffect(c, mode);
}
@@ -161,7 +161,7 @@ public:
SkXfermode::Mode mode = args.fFp.cast<ModeColorFilterEffect>().mode();
SkASSERT(SkXfermode::kDst_Mode != mode);
- const char* colorFilterColorUniName = NULL;
+ const char* colorFilterColorUniName = nullptr;
if (args.fFp.cast<ModeColorFilterEffect>().willUseFilterColor()) {
fFilterColorUni = args.fBuilder->addUniform(
GrGLProgramBuilder::kFragment_Visibility,
@@ -363,7 +363,7 @@ bool SkModeColorFilter::asFragmentProcessors(GrContext*, GrProcessorDataManager*
*array->append() = frag;
} else {
frag->unref();
- SkDEBUGCODE(frag = NULL;)
+ SkDEBUGCODE(frag = nullptr;)
}
return true;
}
@@ -403,7 +403,7 @@ private:
SkColorFilter* SkColorFilter::CreateModeFilter(SkColor color, SkXfermode::Mode mode) {
if (!SkIsValidMode(mode)) {
- return NULL;
+ return nullptr;
}
unsigned alpha = SkColorGetA(color);
@@ -431,7 +431,7 @@ SkColorFilter* SkColorFilter::CreateModeFilter(SkColor color, SkXfermode::Mode m
SkXfermode::kXor_Mode == mode ||
SkXfermode::kDarken_Mode == mode)) ||
(0xFF == alpha && SkXfermode::kDstIn_Mode == mode)) {
- return NULL;
+ return nullptr;
}
switch (mode) {
« no previous file with comments | « src/effects/SkColorFilterImageFilter.cpp ('k') | src/effects/SkColorMatrixFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698