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

src/gpu/gl/GrGLRenderTarget.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGLRenderTarget.h"
 
 #include "GrGLGpu.h"
@@ skipping 172 matching lines @@
     // texture object.
 
     // Log any renderbuffer's contribution to memory. We only do this if we own the renderbuffer
     // (have a fMSColorRenderbufferID).
     if (fMSColorRenderbufferID) {
         size_t size = this->msaaSamples() * this->totalBytesPerSample();
 
         // Due to this resource having both a texture and a renderbuffer component, dump as
         // skia/gpu_resources/resource_#/renderbuffer
         SkString dumpName("skia/gpu_resources/resource_");
-        dumpName.appendS32(this->getUniqueID());
+        dumpName.appendS32(this->uniqueID());
         dumpName.append("/renderbuffer");
 
         traceMemoryDump->dumpNumericValue(dumpName.c_str(), "size", "bytes", size);
 
         if (this->isPurgeable()) {
             traceMemoryDump->dumpNumericValue(dumpName.c_str(), "purgeable_size", "bytes", size);
         }
 
         SkString renderbuffer_id;
         renderbuffer_id.appendU32(fMSColorRenderbufferID);
@@ skipping 26 matching lines @@
 int GrGLRenderTarget::totalSamples() const {
   int total_samples = this->msaaSamples();
 
   if (fTexFBOID != kUnresolvableFBOID) {
       // If we own the resolve buffer then that is one more sample per pixel.
       total_samples += 1;
   }
 
   return total_samples;
 }