Have GrSurfaceProxys and GrGpuResources draw from the same pool of unique ids

src/gpu/instanced/GLInstancedRendering.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GLInstancedRendering.h"
 
 #include "GrResourceProvider.h"
@@ skipping 246 matching lines @@
             emulatedBaseInstance += cmdInfo.fInstanceCount;
         }
     }
 }
 
 void GLInstancedRendering::flushInstanceAttribs(int baseInstance) {
     SkASSERT(fVertexArrayID);
     this->glGpu()->bindVertexArray(fVertexArrayID);
 
     SkASSERT(fInstanceBuffer);
-    if (fInstanceAttribsBufferUniqueId != fInstanceBuffer->getUniqueID() ||
+    if (fInstanceAttribsBufferUniqueId != fInstanceBuffer->uniqueID() ||
         fInstanceAttribsBaseInstance != baseInstance) {
         Instance* offsetInBuffer = (Instance*) nullptr + baseInstance;
 
         this->glGpu()->bindBuffer(kVertex_GrBufferType, fInstanceBuffer.get());
 
         // Info attrib.
         GL_CALL(EnableVertexAttribArray((int)Attrib::kInstanceInfo));
         GL_CALL(VertexAttribIPointer((int)Attrib::kInstanceInfo, 1, GR_GL_UNSIGNED_INT,
                                      sizeof(Instance), &offsetInBuffer->fInfo));
         GL_CALL(VertexAttribDivisor((int)Attrib::kInstanceInfo, 1));
@@ skipping 13 matching lines @@
         GL_CALL(VertexAttribPointer((int)Attrib::kColor, 4, GR_GL_UNSIGNED_BYTE, GR_GL_TRUE,
                                     sizeof(Instance), &offsetInBuffer->fColor));
         GL_CALL(VertexAttribDivisor((int)Attrib::kColor, 1));
 
         // Local rect attrib.
         GL_CALL(EnableVertexAttribArray((int)Attrib::kLocalRect));
         GL_CALL(VertexAttribPointer((int)Attrib::kLocalRect, 4, GR_GL_FLOAT, GR_GL_FALSE,
                                     sizeof(Instance), &offsetInBuffer->fLocalRect));
         GL_CALL(VertexAttribDivisor((int)Attrib::kLocalRect, 1));
 
-        fInstanceAttribsBufferUniqueId = fInstanceBuffer->getUniqueID();
+        fInstanceAttribsBufferUniqueId = fInstanceBuffer->uniqueID();
         fInstanceAttribsBaseInstance = baseInstance;
     }
 }
 
 void GLInstancedRendering::onEndFlush() {
     fInstanceBuffer.reset();
     fDrawIndirectBuffer.reset();
     fGLDrawCmdsInfo.reset(0);
 }
 
 void GLInstancedRendering::onResetGpuResources(ResetType resetType) {
     if (fVertexArrayID && ResetType::kDestroy == resetType) {
         GL_CALL(DeleteVertexArrays(1, &fVertexArrayID));
         this->glGpu()->notifyVertexArrayDelete(fVertexArrayID);
     }
     fVertexArrayID = 0;
     fInstanceBuffer.reset();
     fDrawIndirectBuffer.reset();
     fInstanceAttribsBufferUniqueId = SK_InvalidUniqueID;
 }
 
 }