| Index: src/gpu/GrDrawState.cpp
|
| diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
|
| index f2028eaf94fb182aabe6c0091cc69ab6df76c3c0..4834811a87d3e2b2c6ff5f58410a193597d8b19f 100644
|
| --- a/src/gpu/GrDrawState.cpp
|
| +++ b/src/gpu/GrDrawState.cpp
|
| @@ -287,7 +287,7 @@ bool GrDrawState::couldApplyCoverage(const GrDrawTargetCaps& caps) const {
|
|
|
| GrDrawState::AutoVertexAttribRestore::AutoVertexAttribRestore(
|
| GrDrawState* drawState) {
|
| - SkASSERT(NULL != drawState);
|
| + SkASSERT(drawState);
|
| fDrawState = drawState;
|
| fVAPtr = drawState->fVAPtr;
|
| fVACount = drawState->fVACount;
|
| @@ -298,7 +298,7 @@ GrDrawState::AutoVertexAttribRestore::AutoVertexAttribRestore(
|
| //////////////////////////////////////////////////////////////////////////////s
|
|
|
| void GrDrawState::AutoRestoreEffects::set(GrDrawState* ds) {
|
| - if (NULL != fDrawState) {
|
| + if (fDrawState) {
|
| // See the big comment on the class definition about GPs.
|
| if (SK_InvalidUniqueID == fOriginalGPID) {
|
| fDrawState->fGeometryProcessor.reset(NULL);
|
| @@ -447,7 +447,7 @@ GrRODrawState::BlendOptFlags GrDrawState::calcBlendOpts(bool forceCoverage,
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|
| void GrDrawState::AutoViewMatrixRestore::restore() {
|
| - if (NULL != fDrawState) {
|
| + if (fDrawState) {
|
| SkDEBUGCODE(--fDrawState->fBlockEffectRemovalCnt;)
|
| fDrawState->fViewMatrix = fViewMatrix;
|
| SkASSERT(fDrawState->numColorStages() >= fNumColorStages);
|
|
|