Start using RenderTargetProxy (omnibus)

src/core/SkSpecialSurface.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 "SkCanvas.h"
 #include "SkSpecialImage.h"
 #include "SkSpecialSurface.h"
@@ skipping 93 matching lines @@
     }
 
     const SkIRect subset = SkIRect::MakeWH(pr->info().width(), pr->info().height());
 
     return sk_make_sp<SkSpecialSurface_Raster>(pr.get(), subset, props);
 }
 
 #if SK_SUPPORT_GPU
 ///////////////////////////////////////////////////////////////////////////////
 #include "GrContext.h"
+#include "GrTextureProxy.h"
 #include "SkGpuDevice.h"
 
 class SkSpecialSurface_Gpu : public SkSpecialSurface_Base {
 public:
     SkSpecialSurface_Gpu(sk_sp<GrRenderTargetContext> renderTargetContext,
                          int width, int height,
                          const SkIRect& subset)
         : INHERITED(subset, &renderTargetContext->surfaceProps())
         , fRenderTargetContext(std::move(renderTargetContext)) {
 
         sk_sp<SkBaseDevice> device(SkGpuDevice::Make(fRenderTargetContext, width, height,
                                                      SkGpuDevice::kUninit_InitContents));
         if (!device) {
             return;
         }
 
         fCanvas.reset(new SkCanvas(device.get()));
         fCanvas->clipRect(SkRect::Make(subset));
 #ifdef SK_IS_BOT
         fCanvas->clear(SK_ColorRED);  // catch any imageFilter sloppiness
 #endif
     }
 
     ~SkSpecialSurface_Gpu() override { }
 
     sk_sp<SkSpecialImage> onMakeImageSnapshot() override {
-        sk_sp<SkSpecialImage> tmp(SkSpecialImage::MakeFromGpu(
+        sk_sp<SkSpecialImage> tmp(SkSpecialImage::MakeDeferredFromGpu(
                                                    this->subset(),
                                                    kNeedNewImageUniqueID_SpecialImage,
-                                                   fRenderTargetContext->asTexture(),
+                                                   fRenderTargetContext->asDeferredTexture(),
                                                    sk_ref_sp(fRenderTargetContext->getColorSpace()),
                                                    &this->props()));
         fRenderTargetContext = nullptr;
         return tmp;
     }
 
 private:
     sk_sp<GrRenderTargetContext> fRenderTargetContext;
 
     typedef SkSpecialSurface_Base INHERITED;
@@ skipping 12 matching lines @@
     if (!renderTargetContext) {
         return nullptr;
     }
 
     const SkIRect subset = SkIRect::MakeWH(width, height);
 
     return sk_make_sp<SkSpecialSurface_Gpu>(std::move(renderTargetContext), width, height, subset);
 }
 
 #endif