Revert of GrResourceCache2 manages scratch texture.

src/gpu/SkGrPixelRef.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 83 matching lines @@
     context->flush();
 
     SkImageInfo info = SkImageInfo::Make(desc.fWidth, desc.fHeight, dstCT, kPremul_SkAlphaType);
     SkGrPixelRef* pixelRef = SkNEW_ARGS(SkGrPixelRef, (info, dst));
     SkSafeUnref(dst);
     return pixelRef;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkGrPixelRef::SkGrPixelRef(const SkImageInfo& info, GrSurface* surface) : INHERITED(info) {
+SkGrPixelRef::SkGrPixelRef(const SkImageInfo& info, GrSurface* surface,
+                           bool transferCacheLock) : INHERITED(info) {
     // For surfaces that are both textures and render targets, the texture owns the
     // render target but not vice versa. So we ref the texture to keep both alive for
     // the lifetime of this pixel ref.
     fSurface = SkSafeRef(surface->asTexture());
     if (NULL == fSurface) {
         fSurface = SkSafeRef(surface);
     }
+    fUnlock = transferCacheLock;
 
     if (fSurface) {
         SkASSERT(info.width() <= fSurface->width());
         SkASSERT(info.height() <= fSurface->height());
     }
 }
 
 SkGrPixelRef::~SkGrPixelRef() {
+    if (fUnlock) {
+        GrContext* context = fSurface->getContext();
+        GrTexture* texture = fSurface->asTexture();
+        if (context && texture) {
+            context->unlockScratchTexture(texture);
+        }
+    }
     SkSafeUnref(fSurface);
 }
 
 GrTexture* SkGrPixelRef::getTexture() {
     if (fSurface) {
         return fSurface->asTexture();
     }
     return NULL;
 }
 
@@ skipping 60 matching lines @@
         cachedBitmap.setImmutable();
         //Add to the cache
         SkBitmapCache::Add(this->getGenerationID(), bounds, cachedBitmap);
 
         dst->swap(cachedBitmap);
     }
 
     return true;
 
 }