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

src/gpu/GrGpuResource.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 "GrGpuResource.h"
 #include "GrContext.h"
 #include "GrResourceCache.h"
@@ skipping 51 matching lines @@
     SkASSERT(fGpu);
     this->onAbandon();
     get_resource_cache(fGpu)->resourceAccess().removeResource(this);
     fGpu = nullptr;
     fGpuMemorySize = 0;
 }
 
 void GrGpuResource::dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const {
     // Dump resource as "skia/gpu_resources/resource_#".
     SkString dumpName("skia/gpu_resources/resource_");
-    dumpName.appendS32(this->getUniqueID());
+    dumpName.appendS32(this->uniqueID());
 
     traceMemoryDump->dumpNumericValue(dumpName.c_str(), "size", "bytes", this->gpuMemorySize());
 
     if (this->isPurgeable()) {
         traceMemoryDump->dumpNumericValue(dumpName.c_str(), "purgeable_size", "bytes",
                                           this->gpuMemorySize());
     }
 
     // Call setMemoryBacking to allow sub-classes with implementation specific backings (such as GL
     // objects) to provide additional information.
@@ skipping 111 matching lines @@
 }
 
 uint32_t GrGpuResource::CreateUniqueID() {
     static int32_t gUniqueID = SK_InvalidUniqueID;
     uint32_t id;
     do {
         id = static_cast<uint32_t>(sk_atomic_inc(&gUniqueID) + 1);
     } while (id == SK_InvalidUniqueID);
     return id;
 }