Minor cleanup (remove unused GrRenderTargetContext::asTexture method)

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

4 files changed, 4 insertions, 33 deletions

diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index 1206cffde6..ba63f3f8ec 100644
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -1036,7 +1036,7 @@ bool SkBlurMaskFilterImpl::directFilterMaskGPU(GrContext* context,
 
     SkScalar xformedSigma = this->computeXformedSigma(viewMatrix);
 
-    GrResourceProvider* resourceProvider = renderTargetContext->resourceProvider();
+    GrResourceProvider* resourceProvider = context->resourceProvider();
     sk_sp<GrFragmentProcessor> fp;
 
     SkRect rect;
@@ -1359,7 +1359,7 @@ bool SkBlurMaskFilterImpl::directFilterRRectMaskGPU(GrContext* context,
         return false;
     }
 
-    GrResourceProvider* resourceProvider = renderTargetContext->resourceProvider();
+    GrResourceProvider* resourceProvider = context->resourceProvider();
     SkScalar xformedSigma = this->computeXformedSigma(viewMatrix);
 
     if (devRRect.isRect() || devRRect.isCircle()) {
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 352cac90af..acc0f671c5 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -107,10 +107,6 @@ GrRenderTargetContext::~GrRenderTargetContext() {
     SkSafeUnref(fOpList);
 }
 
-GrRenderTarget* GrRenderTargetContext::instantiate() {
-    return fRenderTargetProxy->instantiate(fContext->resourceProvider());
-}
-
 GrTextureProxy* GrRenderTargetContext::asTextureProxy() {
     return fRenderTargetProxy->asTextureProxy();
 }
diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/GrRenderTargetContext.h
index acb7f77278..ed4493edd8 100644
--- a/src/gpu/GrRenderTargetContext.h
+++ b/src/gpu/GrRenderTargetContext.h
@@ -28,7 +28,6 @@ class GrRenderTarget;
 class GrRenderTargetContextPriv;
 class GrRenderTargetOpList;
 class GrStyle;
-class GrSurface;
 class GrTextureProxy;
 struct GrUserStencilSettings;
 class SkDrawFilter;
@@ -53,6 +52,8 @@ class SK_API GrRenderTargetContext : public GrSurfaceContext {
 public:
     ~GrRenderTargetContext() override;
 
+    // MDB TODO: This access is mainly provided for the image filters. Remove it when they
+    // no longer need to pass it to the FragmentProcessor ctors.
     GrResourceProvider* resourceProvider() { return fContext->resourceProvider(); }
 
     // We use SkPaint rather than GrPaint here for two reasons:
@@ -358,8 +359,6 @@ public:
 
     bool wasAbandoned() const;
 
-    GrRenderTarget* instantiate();
-
     GrRenderTarget* accessRenderTarget() {
         // TODO: usage of this entry point needs to be reduced and potentially eliminated
         // since it ends the deferral of the GrRenderTarget's allocation
@@ -378,17 +377,6 @@ public:
 
     GrRenderTargetContext* asRenderTargetContext() override { return this; }
 
-    sk_sp<GrTexture> asTexture() {
-        if (!this->accessRenderTarget()) {
-            return nullptr;
-        }
-
-        // TODO: usage of this entry point needs to be reduced and potentially eliminated
-        // since it ends the deferral of the GrRenderTarget's allocation
-        // It's usage should migrate to asTextureProxyRef
-        return sk_ref_sp(this->accessRenderTarget()->asTexture());
-    }
-
     // Provides access to functions that aren't part of the public API.
     GrRenderTargetContextPriv priv();
     const GrRenderTargetContextPriv priv() const;
diff --git a/tests/RenderTargetContextTest.cpp b/tests/RenderTargetContextTest.cpp
index 632ae82838..3db0473b62 100644
--- a/tests/RenderTargetContextTest.cpp
+++ b/tests/RenderTargetContextTest.cpp
@@ -48,19 +48,6 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(RenderTargetContextTest, reporter, ctxInfo) {
         check_is_wrapped_status(reporter, rtCtx.get(), true);
     }
 
-    // A deferred rtCtx's textureProxy is also deferred and GrRenderTargetContext::instantiate()
-    // swaps both from deferred to wrapped
-    {
-        sk_sp<GrRenderTargetContext> rtCtx(get_rtc(ctx, false));
-
-        check_is_wrapped_status(reporter, rtCtx.get(), false);
-
-        GrRenderTarget* rt = rtCtx->instantiate();
-        REPORTER_ASSERT(reporter, rt);
-
-        check_is_wrapped_status(reporter, rtCtx.get(), true);
-    }
-
     // Calling instantiate on a GrRenderTargetContext's textureProxy also instantiates the
     // GrRenderTargetContext
     {