Some cleanup in GrTextureProvider and GrResourceProvider

src/effects/SkMorphologyImageFilter.cpp

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMorphologyImageFilter.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 644 matching lines @@
 
     SkIRect dstRect = SkIRect::MakeWH(rect.width(), rect.height());
     GrSurfaceDesc desc;
     desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = rect.width();
     desc.fHeight = rect.height();
     desc.fConfig = kSkia8888_GrPixelConfig;
     SkIRect srcRect = rect;
 
     if (radius.fWidth > 0) {
-        GrTexture* scratch = context->textureProvider()->refScratchTexture(
-            desc, GrTextureProvider::kApprox_ScratchTexMatch);
+        GrTexture* scratch = context->textureProvider()->createApproxTexture(desc);
         if (NULL == scratch) {
             return false;
         }
         GrDrawContext* dstDrawContext = context->drawContext();
         if (!dstDrawContext) {
             return false;
         }
 
         apply_morphology_pass(dstDrawContext, scratch->asRenderTarget(), clip, srcTexture,
                               srcRect, dstRect, radius.fWidth, morphType,
                               Gr1DKernelEffect::kX_Direction);
         SkIRect clearRect = SkIRect::MakeXYWH(dstRect.fLeft, dstRect.fBottom,
                                               dstRect.width(), radius.fHeight);
         GrColor clearColor = GrMorphologyEffect::kErode_MorphologyType == morphType ?
                                 SK_ColorWHITE :
                                 SK_ColorTRANSPARENT;
         dstDrawContext->clear(scratch->asRenderTarget(), &clearRect, clearColor, false);
 
         srcTexture.reset(scratch);
         srcRect = dstRect;
     }
     if (radius.fHeight > 0) {
-        GrTexture* scratch = context->textureProvider()->refScratchTexture(desc,
-            GrTextureProvider::kApprox_ScratchTexMatch);
+        GrTexture* scratch = context->textureProvider()->createApproxTexture(desc);
         if (NULL == scratch) {
             return false;
         }
         GrDrawContext* dstDrawContext = context->drawContext();
         if (!dstDrawContext) {
             return false;
         }
 
         apply_morphology_pass(dstDrawContext, scratch->asRenderTarget(), clip, srcTexture,
                               srcRect, dstRect, radius.fHeight, morphType,
@@ skipping 56 matching lines @@
                                          SkBitmap* result, SkIPoint* offset) const {
     return this->filterImageGPUGeneric(true, proxy, src, ctx, result, offset);
 }
 
 bool SkErodeImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
                                         SkBitmap* result, SkIPoint* offset) const {
     return this->filterImageGPUGeneric(false, proxy, src, ctx, result, offset);
 }
 
 #endif