Start using RenderTargetProxy (omnibus)

src/image/SkSurface_Gpu.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkSurface_Gpu.h"
 
 #include "GrContextPriv.h"
@@ skipping 23 matching lines @@
         case SkSurface::kFlushWrite_BackendHandleAccess:
         case SkSurface::kDiscardWrite_BackendHandleAccess:
             // for now we don't special-case on Discard, but we may in the future.
             surface->notifyContentWillChange(SkSurface::kRetain_ContentChangeMode);
             break;
     }
 
     // Grab the render target *after* firing notifications, as it may get switched if CoW kicks in.
     surface->getDevice()->flush();
     GrRenderTargetContext* rtc = surface->getDevice()->accessRenderTargetContext();
-    return rtc->accessRenderTarget();
+    return rtc->instantiate();
 }
 
 GrBackendObject SkSurface_Gpu::onGetTextureHandle(BackendHandleAccess access) {
     GrRenderTarget* rt = prepare_rt_for_external_access(this, access);
     GrTexture* texture = rt->asTexture();
     if (texture) {
         return texture->getTextureHandle();
     }
     return 0;
 }
@@ skipping 204 matching lines @@
 
     sk_sp<SkGpuDevice> device(SkGpuDevice::Make(std::move(rtc), desc.fWidth, desc.fHeight,
                                                 SkGpuDevice::kUninit_InitContents));
     if (!device) {
         return nullptr;
     }
     return sk_make_sp<SkSurface_Gpu>(std::move(device));
 }
 
 #endif