| Index: src/gpu/effects/GrBezierEffect.h
|
| diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h
|
| index b78c3f31138f135cf7d658cfbff217e4fcba8eac..1c76c64f5bd3e362a961edc0a91c296d02fbd487 100644
|
| --- a/src/gpu/effects/GrBezierEffect.h
|
| +++ b/src/gpu/effects/GrBezierEffect.h
|
| @@ -68,13 +68,13 @@ public:
|
| switch (edgeType) {
|
| case kFillAA_GrProcessorEdgeType:
|
| if (!caps.shaderCaps()->shaderDerivativeSupport()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return new GrConicEffect(color, viewMatrix, coverage, kFillAA_GrProcessorEdgeType,
|
| localMatrix, usesLocalCoords);
|
| case kHairlineAA_GrProcessorEdgeType:
|
| if (!caps.shaderCaps()->shaderDerivativeSupport()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return new GrConicEffect(color, viewMatrix, coverage,
|
| kHairlineAA_GrProcessorEdgeType, localMatrix,
|
| @@ -83,7 +83,7 @@ public:
|
| return new GrConicEffect(color, viewMatrix, coverage, kFillBW_GrProcessorEdgeType,
|
| localMatrix, usesLocalCoords);
|
| default:
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
| @@ -151,13 +151,13 @@ public:
|
| switch (edgeType) {
|
| case kFillAA_GrProcessorEdgeType:
|
| if (!caps.shaderCaps()->shaderDerivativeSupport()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return new GrQuadEffect(color, viewMatrix, coverage, kFillAA_GrProcessorEdgeType,
|
| localMatrix, usesLocalCoords);
|
| case kHairlineAA_GrProcessorEdgeType:
|
| if (!caps.shaderCaps()->shaderDerivativeSupport()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return new GrQuadEffect(color, viewMatrix, coverage,
|
| kHairlineAA_GrProcessorEdgeType, localMatrix,
|
| @@ -166,7 +166,7 @@ public:
|
| return new GrQuadEffect(color, viewMatrix, coverage, kFillBW_GrProcessorEdgeType,
|
| localMatrix, usesLocalCoords);
|
| default:
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
| @@ -233,18 +233,18 @@ public:
|
| switch (edgeType) {
|
| case kFillAA_GrProcessorEdgeType:
|
| if (!caps.shaderCaps()->shaderDerivativeSupport()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return new GrCubicEffect(color, viewMatrix, kFillAA_GrProcessorEdgeType);
|
| case kHairlineAA_GrProcessorEdgeType:
|
| if (!caps.shaderCaps()->shaderDerivativeSupport()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return new GrCubicEffect(color, viewMatrix, kHairlineAA_GrProcessorEdgeType);
|
| case kFillBW_GrProcessorEdgeType:
|
| return new GrCubicEffect(color, viewMatrix, kFillBW_GrProcessorEdgeType);
|
| default:
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
|
|