Revert of GrResourceCache2 manages scratch texture.

include/gpu/SkGrPixelRef.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGrPixelRef_DEFINED
 #define SkGrPixelRef_DEFINED
 
@@ skipping 23 matching lines @@
     typedef SkPixelRef INHERITED;
 };
 
 /**
  *  PixelRef that wraps a GrSurface
  */
 class SK_API SkGrPixelRef : public SkROLockPixelsPixelRef {
 public:
     SK_DECLARE_INST_COUNT(SkGrPixelRef)
     /**
-     * Constructs a pixel ref around a GrSurface.
+     * Constructs a pixel ref around a GrSurface. If the caller has locked the GrSurface in the
+     * cache and would like the pixel ref to unlock it in its destructor then transferCacheLock
+     * should be set to true.
      */
-    SkGrPixelRef(const SkImageInfo&, GrSurface*);
+    SkGrPixelRef(const SkImageInfo&, GrSurface*, bool transferCacheLock = false);
     virtual ~SkGrPixelRef();
 
     // override from SkPixelRef
     virtual GrTexture* getTexture() SK_OVERRIDE;
 
 protected:
     // overrides from SkPixelRef
     virtual bool onReadPixels(SkBitmap* dst, const SkIRect* subset) SK_OVERRIDE;
     virtual SkPixelRef* deepCopy(SkColorType, const SkIRect* subset) SK_OVERRIDE;
 
 private:
     GrSurface*  fSurface;
+    bool        fUnlock;   // if true the pixel ref owns a texture cache lock on fSurface
+
     typedef SkROLockPixelsPixelRef INHERITED;
 };
 
 #endif