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

Unified Diff: src/effects/gradients/SkTwoPointConicalGradient_gpu.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/gradients/SkTwoPointConicalGradient.cpp ('k') | src/fonts/SkFontMgr_fontconfig.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
index cdc18629cf54b011965eedbae12973fce1359388..30f0fdf6a1fae5e369f3fd716f8b658ac7a79461 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
@@ -213,14 +213,14 @@ GrFragmentProcessor* Edge2PtConicalEffect::TestCreate(GrProcessorTestData* d) {
GrFragmentProcessor* fp;
GrColor paintColor;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
- GrTest::TestMatrix(d->fRandom), NULL,
+ GrTest::TestMatrix(d->fRandom), nullptr,
&paintColor, d->fProcDataManager, &fp));
return fp;
}
GLEdge2PtConicalEffect::GLEdge2PtConicalEffect(const GrProcessor&)
- : fVSVaryingName(NULL)
- , fFSVaryingName(NULL)
+ : fVSVaryingName(nullptr)
+ , fFSVaryingName(nullptr)
, fCachedRadius(-SK_ScalarMax)
, fCachedDiffRadius(-SK_ScalarMax) {}
@@ -493,15 +493,15 @@ GrFragmentProcessor* FocalOutside2PtConicalEffect::TestCreate(GrProcessorTestDat
GrColor paintColor;
GrPaint grPaint;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
- GrTest::TestMatrix(d->fRandom), NULL,
+ GrTest::TestMatrix(d->fRandom), nullptr,
&paintColor, d->fProcDataManager,
&effect));
return effect;
}
GLFocalOutside2PtConicalEffect::GLFocalOutside2PtConicalEffect(const GrProcessor& processor)
- : fVSVaryingName(NULL)
- , fFSVaryingName(NULL)
+ : fVSVaryingName(nullptr)
+ , fFSVaryingName(nullptr)
, fCachedFocal(SK_ScalarMax) {
const FocalOutside2PtConicalEffect& data = processor.cast<FocalOutside2PtConicalEffect>();
fIsFlipped = data.isFlipped();
@@ -705,14 +705,14 @@ GrFragmentProcessor* FocalInside2PtConicalEffect::TestCreate(GrProcessorTestData
GrColor paintColor;
GrFragmentProcessor* fp;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
- GrTest::TestMatrix(d->fRandom), NULL,
+ GrTest::TestMatrix(d->fRandom), nullptr,
&paintColor, d->fProcDataManager, &fp));
return fp;
}
GLFocalInside2PtConicalEffect::GLFocalInside2PtConicalEffect(const GrProcessor&)
- : fVSVaryingName(NULL)
- , fFSVaryingName(NULL)
+ : fVSVaryingName(nullptr)
+ , fFSVaryingName(nullptr)
, fCachedFocal(SK_ScalarMax) {}
void GLFocalInside2PtConicalEffect::emitCode(EmitArgs& args) {
@@ -952,14 +952,14 @@ CircleInside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {
GrColor paintColor;
GrFragmentProcessor* fp;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
- GrTest::TestMatrix(d->fRandom), NULL,
+ GrTest::TestMatrix(d->fRandom), nullptr,
&paintColor, d->fProcDataManager, &fp));
return fp;
}
GLCircleInside2PtConicalEffect::GLCircleInside2PtConicalEffect(const GrProcessor& processor)
- : fVSVaryingName(NULL)
- , fFSVaryingName(NULL)
+ : fVSVaryingName(nullptr)
+ , fFSVaryingName(nullptr)
, fCachedCenterX(SK_ScalarMax)
, fCachedCenterY(SK_ScalarMax)
, fCachedA(SK_ScalarMax)
@@ -1183,14 +1183,14 @@ GrFragmentProcessor* CircleOutside2PtConicalEffect::TestCreate(GrProcessorTestDa
GrColor paintColor;
GrFragmentProcessor* fp;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
- GrTest::TestMatrix(d->fRandom), NULL,
+ GrTest::TestMatrix(d->fRandom), nullptr,
&paintColor, d->fProcDataManager, &fp));
return fp;
}
GLCircleOutside2PtConicalEffect::GLCircleOutside2PtConicalEffect(const GrProcessor& processor)
- : fVSVaryingName(NULL)
- , fFSVaryingName(NULL)
+ : fVSVaryingName(nullptr)
+ , fFSVaryingName(nullptr)
, fCachedCenterX(SK_ScalarMax)
, fCachedCenterY(SK_ScalarMax)
, fCachedA(SK_ScalarMax)
@@ -1301,12 +1301,12 @@ GrFragmentProcessor* Gr2PtConicalGradientEffect::Create(GrContext* ctx,
const SkMatrix* localMatrix) {
SkMatrix matrix;
if (!shader.getLocalMatrix().invert(&matrix)) {
- return NULL;
+ return nullptr;
}
if (localMatrix) {
SkMatrix inv;
if (!localMatrix->invert(&inv)) {
- return NULL;
+ return nullptr;
}
matrix.postConcat(inv);
}
« no previous file with comments | « src/effects/gradients/SkTwoPointConicalGradient.cpp ('k') | src/fonts/SkFontMgr_fontconfig.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698