Add a simpler key type for scratch resource keys.

src/gpu/GrTexturePriv.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTexturePriv_DEFINED
 #define GrTexturePriv_DEFINED
 
@@ skipping 21 matching lines @@
     void dirtyMipMaps(bool mipMapsDirty) { fTexture->dirtyMipMaps(mipMapsDirty); }
 
     bool mipMapsAreDirty() const {
         return GrTexture::kValid_MipMapsStatus != fTexture->fMipMapsStatus;
     }
 
     bool hasMipMaps() const {
         return GrTexture::kNotAllocated_MipMapsStatus != fTexture->fMipMapsStatus;
     }
 
-    static GrResourceKey::ResourceType ResourceType() {
-        static const GrResourceKey::ResourceType gType = GrResourceKey::GenerateResourceType();
-        return gType;
-    }
-
     static GrResourceKey ComputeKey(const GrGpu* gpu,
                                     const GrTextureParams* params,
                                     const GrSurfaceDesc& desc,
                                     const GrCacheID& cacheID);
-    static GrResourceKey ComputeScratchKey(const GrSurfaceDesc& desc);
+    static void ComputeScratchKey(const GrSurfaceDesc&, GrScratchKey*);
     static bool NeedsResizing(const GrResourceKey& key);
     static bool NeedsBilerp(const GrResourceKey& key);
 
 
     // TODO: Move this logic and the shift values out of here and to the callers.
     SkFixed normalizeFixedX(SkFixed x) const {
         SkASSERT(SkIsPow2(fTexture->fDesc.fWidth));
         return x >> fTexture->fShiftFixedX;
     }
 
@@ skipping 16 matching lines @@
     friend class GrTexture; // to construct/copy this type.
 };
 
 inline GrTexturePriv GrTexture::texturePriv() { return GrTexturePriv(this); }
 
 inline const GrTexturePriv GrTexture::texturePriv () const {
     return GrTexturePriv(const_cast<GrTexture*>(this));
 }
 
 #endif