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

src/gpu/effects/GrSingleTextureEffect.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrSingleTextureEffect_DEFINED
 #define GrSingleTextureEffect_DEFINED
 
 #include "GrFragmentProcessor.h"
 #include "GrColorSpaceXform.h"
 #include "GrCoordTransform.h"
 #include "GrInvariantOutput.h"
 #include "SkMatrix.h"
 
 class GrTexture;
 
 /**
  * A base class for effects that draw a single texture with a texture matrix. This effect has no
  * backend implementations. One must be provided by the subclass.
  */
 class GrSingleTextureEffect : public GrFragmentProcessor {
 public:
     ~GrSingleTextureEffect() override;
 
     SkString dumpInfo() const override {
         SkString str;
-        str.appendf("Texture: %d", fTextureAccess.getTexture()->getUniqueID());
+        str.appendf("Texture: %d", fTextureAccess.getTexture()->uniqueID());
         return str;
     }
 
 protected:
     /** unfiltered, clamp mode */
     GrSingleTextureEffect(GrTexture*, sk_sp<GrColorSpaceXform>, const SkMatrix&,
                           GrCoordSet = kLocal_GrCoordSet);
     /** clamp mode */
     GrSingleTextureEffect(GrTexture*, sk_sp<GrColorSpaceXform>, const SkMatrix&,
                           GrTextureParams::FilterMode filterMode, GrCoordSet = kLocal_GrCoordSet);
@@ skipping 20 matching lines @@
 
 private:
     GrCoordTransform fCoordTransform;
     GrTextureAccess  fTextureAccess;
     sk_sp<GrColorSpaceXform> fColorSpaceXform;
 
     typedef GrFragmentProcessor INHERITED;
 };
 
 #endif