commit f200a90f3e58ce20753420cadced850d7d00dca1
author Robert Phillips <robertphillips@google.com> Mon Jan 30 13:27:37 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jan 30 19:05:36 2017 +0000
tree d4618a39bdd6f74b070b236283819ae7f4770d33
parent efe3dedbb3493b738abdb56041b093245e4e8711

Rationalize GrContext's Gr*Proxy getter naming

This CL replaces the entry points:

asDeferredSurface
asDeferredTexture
asDeferredRenderTarget

with:

GrSurfaceProxy* asSurfaceProxy
sk_sp<GrSurfaceProxy> asSurfaceProxyRef

GrTextureProxy* asTextureProxy
sk_sp<GrTextureProxy> asTextureProxyRef

GrRenderTargetProxy* asRenderTargetProxy
sk_sp<GrRenderTargetProxy> asRenderTargetProxyRef

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

src/effects/SkDisplacementMapEffect.cpp

diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index cee47f4..9693191 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -374,7 +374,7 @@
                                             context,
                                             SkIRect::MakeWH(bounds.width(), bounds.height()),
                                             kNeedNewImageUniqueID_SpecialImage,
-                                            sk_ref_sp(renderTargetContext->asDeferredTexture()),
+                                            renderTargetContext->asTextureProxyRef(),
                                             renderTargetContext->refColorSpace());
     }
 #endif