Start using RenderTargetProxy (omnibus)

src/core/SkSpecialSurface.cpp

Index: src/core/SkSpecialSurface.cpp
diff --git a/src/core/SkSpecialSurface.cpp b/src/core/SkSpecialSurface.cpp
index beba9150c4c5f899295653f4a293a919a38fd3b5..45bb75d2c97258a8985363434c9adb3996e7dcb0 100644
--- a/src/core/SkSpecialSurface.cpp
+++ b/src/core/SkSpecialSurface.cpp
@@ -111,6 +111,7 @@ sk_sp<SkSpecialSurface> SkSpecialSurface::MakeRaster(const SkImageInfo& info,
 #if SK_SUPPORT_GPU
 ///////////////////////////////////////////////////////////////////////////////
 #include "GrContext.h"
+#include "GrTextureProxy.h"
 #include "SkGpuDevice.h"
 
 class SkSpecialSurface_Gpu : public SkSpecialSurface_Base {
@@ -137,10 +138,10 @@ public:
     ~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;