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

src/gpu/GrTextureProxy.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 "GrTextureProxy.h"
 
 #include "GrTextureProvider.h"
 #include "GrGpuResourcePriv.h"
 
+GrTextureProxy::GrTextureProxy(const GrSurfaceDesc& srcDesc, SkBackingFit fit, SkBudgeted budgeted,
+                               const void* /*srcData*/, size_t /*rowBytes*/)
+    : INHERITED(srcDesc, fit, budgeted) {
+    // TODO: Handle 'srcData' here
+}
+
 GrTextureProxy::GrTextureProxy(sk_sp<GrTexture> tex)
-    : INHERITED(tex->desc(), SkBackingFit::kExact, tex->resourcePriv().isBudgeted())
+    : INHERITED(tex->desc(), SkBackingFit::kExact,
+                tex->resourcePriv().isBudgeted(), tex->uniqueID())
     , fTexture(std::move(tex)) {
 }
 
 GrTexture* GrTextureProxy::instantiate(GrTextureProvider* texProvider) {
     if (fTexture) {
         return fTexture.get();
     }
 
     if (SkBackingFit::kApprox == fFit) {
         fTexture.reset(texProvider->createApproxTexture(fDesc));
@@ skipping 10 matching lines @@
                                            const void* srcData,
                                            size_t rowBytes) {
     // TODO: handle 'srcData' (we could use the wrapped version if there is data)
     SkASSERT(!srcData && !rowBytes);
     return sk_sp<GrTextureProxy>(new GrTextureProxy(desc, fit, budgeted, srcData, rowBytes));
 }
 
 sk_sp<GrTextureProxy> GrTextureProxy::Make(sk_sp<GrTexture> tex) {
     return sk_sp<GrTextureProxy>(new GrTextureProxy(std::move(tex)));
 }