GrResourceCache2 manages scratch texture.

src/gpu/SkGr.cpp

Index: src/gpu/SkGr.cpp
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index e81abdbae475c14a3d99a17afed4601b6cad2a53..d9435459f1900ad23487cd2a5309c1b6152f958b 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -369,9 +369,9 @@ bool GrIsBitmapInCache(const GrContext* ctx,
     return ctx->isTextureInCache(desc, cacheID, params);
 }
 

[robertphillips, 2014/09/29 15:25:08]

At some point it seems this should be "GrGetBackingTexture" and just leaving the
reffing to the client.

[bsalomon, 2014/09/29 19:58:14]

Hm... most of our methods across Skia that return a ref-cnt'ed object pre-ref
it. It feels dangerous to me to have getters to cache objects that haven't
already ref'ed the object. The caller has to be extremely careful to not do
something that could purge the object before a ref is taken. Also, If we ever
want GrRC to be thread-safe then we have to have already ref'ed it.

-GrTexture* GrLockAndRefCachedBitmapTexture(GrContext* ctx,
-                                           const SkBitmap& bitmap,
-                                           const GrTextureParams* params) {
+GrTexture* GrRefCachedBitmapTexture(GrContext* ctx,
+                                    const SkBitmap& bitmap,
+                                    const GrTextureParams* params) {
     GrTexture* result = NULL;
 
     bool cache = !bitmap.isVolatile();
@@ -397,13 +397,6 @@ GrTexture* GrLockAndRefCachedBitmapTexture(GrContext* ctx,
     return result;
 }
 
-void GrUnlockAndUnrefCachedBitmapTexture(GrTexture* texture) {
-    SkASSERT(texture->getContext());
-
-    texture->getContext()->unlockScratchTexture(texture);
-    texture->unref();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 // alphatype is ignore for now, but if GrPixelConfig is expanded to encompass