Refugee from Dead Machine 4: MDB Monster

src/gpu/GrVertices.h

Index: src/gpu/GrVertices.h
diff --git a/src/gpu/GrVertices.h b/src/gpu/GrVertices.h
index 03ede07d154cc2d9ddefad0eef620d9eaa2036c2..43aa3fd3c568ec40c4b71df7bbb110c6bc375e8f 100644
--- a/src/gpu/GrVertices.h
+++ b/src/gpu/GrVertices.h
@@ -52,8 +52,8 @@ public:
         SkASSERT(vertexCount);
         SkASSERT(startVertex >= 0);
         fPrimitiveType = primType;
-        fVertexBuffer.reset(vertexBuffer);
-        fIndexBuffer.reset(nullptr);
+        fVertexBuffer.reset(vertexBuffer, nullptr);
+        fIndexBuffer.reset(nullptr, nullptr);
         fStartVertex = startVertex;
         fStartIndex = 0;
         fVertexCount = vertexCount;
@@ -78,8 +78,8 @@ public:
         SkASSERT(startIndex >= 0);
         SkASSERT(startVertex >= 0);
         fPrimitiveType = primType;
-        fVertexBuffer.reset(vertexBuffer);
-        fIndexBuffer.reset(indexBuffer);
+        fVertexBuffer.reset(vertexBuffer, NULL);
+        fIndexBuffer.reset(indexBuffer, NULL);
         fStartVertex = startVertex;
         fStartIndex = startIndex;
         fVertexCount = vertexCount;
@@ -109,8 +109,8 @@ public:
         SkASSERT(indicesPerInstance);
         SkASSERT(startVertex >= 0);
         fPrimitiveType = primType;
-        fVertexBuffer.reset(vertexBuffer);
-        fIndexBuffer.reset(indexBuffer);
+        fVertexBuffer.reset(vertexBuffer, NULL);
+        fIndexBuffer.reset(indexBuffer, NULL);
         fStartVertex = startVertex;
         fStartIndex = 0;
         fVerticesPerInstance = verticesPerInstance;
@@ -139,8 +139,8 @@ public:
                 return &vertices;
             }
             SkASSERT(vertices.isInstanced());
-            fInstanceBatch.fIndexBuffer.reset(vertices.fIndexBuffer.get());
-            fInstanceBatch.fVertexBuffer.reset(vertices.fVertexBuffer.get());
+            fInstanceBatch.fIndexBuffer.reset(vertices.fIndexBuffer.get(), NULL);
+            fInstanceBatch.fVertexBuffer.reset(vertices.fVertexBuffer.get(), NULL);
             fInstanceBatch.fIndexCount = vertices.fMaxInstancesPerDraw *
                                          vertices.fIndicesPerInstance;
             fInstanceBatch.fVertexCount = vertices.fMaxInstancesPerDraw *