| Index: src/gpu/GrVertices.h
|
| diff --git a/src/gpu/GrVertices.h b/src/gpu/GrVertices.h
|
| index 10b2679da4dc059d5a2a97b53789f235a4779f79..03ede07d154cc2d9ddefad0eef620d9eaa2036c2 100644
|
| --- a/src/gpu/GrVertices.h
|
| +++ b/src/gpu/GrVertices.h
|
| @@ -53,7 +53,7 @@ public:
|
| SkASSERT(startVertex >= 0);
|
| fPrimitiveType = primType;
|
| fVertexBuffer.reset(vertexBuffer);
|
| - fIndexBuffer.reset(NULL);
|
| + fIndexBuffer.reset(nullptr);
|
| fStartVertex = startVertex;
|
| fStartIndex = 0;
|
| fVertexCount = vertexCount;
|
| @@ -154,7 +154,7 @@ public:
|
|
|
| const GrNonInstancedVertices* next() {
|
| if (!fInstancesRemaining) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| fInstanceBatch.fStartVertex += fInstanceBatch.fVertexCount;
|
| int instances = SkTMin(fInstancesRemaining, fVertices->fMaxInstancesPerDraw);
|
|
|