| Index: src/gpu/GrBufferedDrawTarget.cpp
|
| diff --git a/src/gpu/GrBufferedDrawTarget.cpp b/src/gpu/GrBufferedDrawTarget.cpp
|
| index c733f0ce84d3ce05b134a242667eb377fd8d7e95..7ba6a2d70fb9c39ecef89d4a7f72a504c2ee03ef 100644
|
| --- a/src/gpu/GrBufferedDrawTarget.cpp
|
| +++ b/src/gpu/GrBufferedDrawTarget.cpp
|
| @@ -54,7 +54,7 @@ void GrBufferedDrawTarget::onReset() {
|
| fPathIndexBuffer.rewind();
|
| fPathTransformBuffer.rewind();
|
|
|
| - fPrevState.reset(NULL);
|
| + fPrevState.reset(nullptr);
|
| // Note, fPrevState points into fPipelineBuffer's allocation, so we have to reset first.
|
| // Furthermore, we have to reset fCommands before fPipelineBuffer too.
|
| if (fDrawID % kPipelineBufferHighWaterMark) {
|
| @@ -76,7 +76,7 @@ GrBufferedDrawTarget::createStateForPathDraw(const GrPrimitiveProcessor* primPro
|
| StateForPathDraw* state = this->allocState(primProc);
|
| if (!GrPipeline::CreateAt(state->pipelineLocation(), pipelineInfo.pipelineCreateArgs(), opts)) {
|
| this->unallocState(state);
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| state->fPrimitiveProcessor->initBatchTracker(&state->fBatchTracker, *opts);
|
|
|