Split out methods in GrGpuResource::CacheAccess that can be called outside of the cache.

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"
 
 #if SK_SUPPORT_GPU
 
 #include "GrGpuResource.h"
+#include "GrGpuResourcePriv.h"
 #include "GrContext.h"
 #include "GrGpu.h"
 #include "GrResourceCache.h"
 #include "SkCanvas.h"
 
 enum {
     CACHE_SIZE_COUNT = 4096,
 };
 
 class BenchResource : public GrGpuResource {
@@ skipping 14 matching lines @@
     size_t onGpuMemorySize() const SK_OVERRIDE { return 100; }
 
     typedef GrGpuResource INHERITED;
 };
 
 static void populate_cache(GrGpu* gpu, int resourceCount) {
     for (int i = 0; i < resourceCount; ++i) {
         GrContentKey key;
         BenchResource::ComputeKey(i, &key);
         GrGpuResource* resource = SkNEW_ARGS(BenchResource, (gpu));
-        resource->cacheAccess().setContentKey(key);
+        resource->resourcePriv().setContentKey(key);
         resource->unref();
     }
 }
 
 class GrResourceCacheBenchAdd : public Benchmark {
 public:
     bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
     }
 
@@ skipping 76 matching lines @@
 
 private:
     SkAutoTUnref<GrContext> fContext;
     typedef Benchmark INHERITED;
 };
 
 DEF_BENCH( return new GrResourceCacheBenchAdd(); )
 DEF_BENCH( return new GrResourceCacheBenchFind(); )
 
 #endif