Add a simpler key type for scratch resource keys.

bench/GrResourceCacheBench.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 
@@ skipping 14 matching lines @@
     SK_DECLARE_INST_COUNT(BenchResource);
     BenchResource (GrGpu* gpu)
         : INHERITED(gpu, false) {
         this->registerWithCache();
     }
 
     static GrResourceKey ComputeKey(int i) {
         GrCacheID::Key key;
         memset(&key, 0, sizeof(key));
         key.fData32[0] = i;
-        static int gType = GrResourceKey::GenerateResourceType();
         static int gDomain = GrCacheID::GenerateDomain();
-        return GrResourceKey(GrCacheID(gDomain, key), gType, 0);
+        return GrResourceKey(GrCacheID(gDomain, key), 0);
     }
 
 
 private:
     size_t onGpuMemorySize() const SK_OVERRIDE { return 100; }
 
     typedef GrGpuResource INHERITED;
 };
 
 static void populate_cache(GrGpu* gpu, int resourceCount) {
@@ skipping 89 matching lines @@
 
 private:
     SkAutoTUnref<GrContext> fContext;
     typedef Benchmark INHERITED;
 };
 
 DEF_BENCH( return new GrResourceCacheBenchAdd(); )
 DEF_BENCH( return new GrResourceCacheBenchFind(); )
 
 #endif