| Index: src/gpu/GrInOrderCommandBuilder.cpp
|
| diff --git a/src/gpu/GrInOrderCommandBuilder.cpp b/src/gpu/GrInOrderCommandBuilder.cpp
|
| index f69dbb49cca60a1af9e929bbbe0a30ec099a9880..b9387e9486c49de4f7ee12e4310b0c177427b2a9 100644
|
| --- a/src/gpu/GrInOrderCommandBuilder.cpp
|
| +++ b/src/gpu/GrInOrderCommandBuilder.cpp
|
| @@ -34,7 +34,7 @@ GrTargetCommands::Cmd* GrInOrderCommandBuilder::recordDrawBatch(GrBatch* batch,
|
| if (previous->batch()->combineIfPossible(batch, caps)) {
|
| GrBATCH_INFO("\tBatching with (%s, %u)\n",
|
| previous->batch()->name(), previous->batch()->uniqueID());
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
| @@ -88,7 +88,7 @@ GrInOrderCommandBuilder::recordDrawPaths(State* state,
|
| &previous->fTransforms[previous->fCount * xformSize] == savedTransforms)) {
|
| // Combine this DrawPaths call with the one previous.
|
| previous->fCount += count;
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
| }
|
|
|