Remove asTextureRef from SkSpecialImage & update effects accordingly

This CL also renames SkSpecialImage::asTextureProxy to asTextureProxyRef

Change-Id: I5ed8e475bb9688453b825ae4500ed0e8d324b5ac
Reviewed-on: https://skia-review.googlesource.com/7995
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 67c96d7ed2..e798935710 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -291,9 +291,7 @@ sk_sp<SkImage> SkImage::makeWithFilter(const SkImageFilter* filter, const SkIRec
     SkImageFilter::OutputProperties outputProperties(colorSpace);
     SkImageFilter::Context context(SkMatrix::I(), clipBounds, cache.get(), outputProperties);
 
-    sk_sp<SkSpecialImage> result =
-        filter->filterImage(srcSpecialImage.get(), context, offset);
-
+    sk_sp<SkSpecialImage> result = filter->filterImage(srcSpecialImage.get(), context, offset);
     if (!result) {
         return nullptr;
     }
@@ -302,11 +300,13 @@ sk_sp<SkImage> SkImage::makeWithFilter(const SkImageFilter* filter, const SkIRec
 #if SK_SUPPORT_GPU
     if (result->isTextureBacked()) {
         GrContext* context = result->getContext();
-        sk_sp<GrTexture> texture = result->asTextureRef(context);
-        if (!texture) {
+        sk_sp<GrTextureProxy> proxy = result->asTextureProxyRef(context);
+        if (!proxy) {
             return nullptr;
         }
-        fullSize = SkIRect::MakeWH(texture->width(), texture->height());
+        // MDB TODO: This is okay for now but will need to updated when we have deferred
+        // SkImage_Gpu objects
+        fullSize = SkIRect::MakeWH(proxy->width(), proxy->height());
     }
 #endif
     *outSubset = SkIRect::MakeWH(result->width(), result->height());