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

src/gpu/GrGpuResource.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGpuResource.h"
 #include "GrResourceCache.h"
 #include "GrGpu.h"
+#include "GrGpuResourcePriv.h"
 
 static inline GrResourceCache* get_resource_cache(GrGpu* gpu) {
     SkASSERT(gpu);
     SkASSERT(gpu->getContext());
     SkASSERT(gpu->getContext()->getResourceCache());
     return gpu->getContext()->getResourceCache();
 }
 
 GrGpuResource::GrGpuResource(GrGpu* gpu, LifeCycle lifeCycle)
     : fGpu(gpu)
@@ skipping 65 matching lines @@
     get_resource_cache(fGpu)->resourceAccess().willRemoveContentKey(this);
     fContentKey.reset();
 }
 
 bool GrGpuResource::setContentKey(const GrContentKey& key) {
     // Currently this can only be called once and can't be called when the resource is scratch.
     SkASSERT(this->internalHasRef());
     SkASSERT(key.isValid());
 
     // Wrapped and uncached resources can never have a content key.
-    if (!this->cacheAccess().isBudgeted()) {
+    if (!this->resourcePriv().isBudgeted()) {
         return false;
     }
 
     if (fContentKey.isValid() || this->wasDestroyed()) {
         return false;
     }
 
     fContentKey = key;
 
     if (!get_resource_cache(fGpu)->resourceAccess().didSetContentKey(this)) {
@@ skipping 45 matching lines @@
 }
 
 uint32_t GrGpuResource::CreateUniqueID() {
     static int32_t gUniqueID = SK_InvalidUniqueID;
     uint32_t id;
     do {
         id = static_cast<uint32_t>(sk_atomic_inc(&gUniqueID) + 1);
     } while (id == SK_InvalidUniqueID);
     return id;
 }