Revert of GrResourceCache2 manages scratch texture.

include/gpu/GrTexture.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTexture_DEFINED
 #define GrTexture_DEFINED
@@ skipping 81 matching lines @@
 
     virtual ~GrTexture();
 
     // GrResource overrides
     virtual void onRelease() SK_OVERRIDE;
     virtual void onAbandon() SK_OVERRIDE;
 
     void validateDesc() const;
 
 private:
+    void abandonReleaseCommon();
+    virtual void internal_dispose() const SK_OVERRIDE;
     void dirtyMipMaps(bool mipMapsDirty);
 
     enum MipMapsStatus {
         kNotAllocated_MipMapsStatus,
         kAllocated_MipMapsStatus,
         kValid_MipMapsStatus
     };
 
     MipMapsStatus   fMipMapsStatus;
     // These two shift a fixed-point value into normalized coordinates  
@@ skipping 39 matching lines @@
         fTexture.reset(SkSafeRef(texture));
         return texture;
     }
 
 private:
     SkAutoTUnref<GrTexture> fTexture;
     SkIPoint                fOffset;
 };
 
 #endif