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

src/gpu/GrRenderTargetProxy.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 "GrRenderTargetProxy.h"
 
 #include "GrCaps.h"
@@ skipping 14 matching lines @@
     if (caps.usesMixedSamples() && fDesc.fSampleCnt > 0) {
         fFlags |= GrRenderTargetPriv::Flags::kMixedSampled;
     }
     if (caps.maxWindowRectangles() > 0) {
         fFlags |= GrRenderTargetPriv::Flags::kWindowRectsSupport;
     }
 }
 
 // Wrapped version
 GrRenderTargetProxy::GrRenderTargetProxy(const GrCaps& caps, sk_sp<GrRenderTarget> rt)
-    : INHERITED(rt->desc(), SkBackingFit::kExact, rt->resourcePriv().isBudgeted())
+    : INHERITED(rt->desc(), SkBackingFit::kExact,
+                rt->resourcePriv().isBudgeted(), rt->getUniqueID())
     , fTarget(std::move(rt))
     , fFlags(fTarget->renderTargetPriv().flags())
     , fLastDrawTarget(nullptr) {
 }
 
 GrRenderTargetProxy::~GrRenderTargetProxy() {
     if (fLastDrawTarget) {
         fLastDrawTarget->clearRT();
     }
     SkSafeUnref(fLastDrawTarget);
@@ skipping 42 matching lines @@
                                                      const GrSurfaceDesc& desc,
                                                      SkBackingFit fit,
                                                      SkBudgeted budgeted) {
     return sk_sp<GrRenderTargetProxy>(new GrRenderTargetProxy(caps, desc, fit, budgeted));
 }
 
 sk_sp<GrRenderTargetProxy> GrRenderTargetProxy::Make(const GrCaps& caps, sk_sp<GrRenderTarget> rt) {
     return sk_sp<GrRenderTargetProxy>(new GrRenderTargetProxy(caps, rt));
 }