make getContentKey() available in GrGpuResource public interface

src/gpu/GrResourceCache2.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrResourceCache2.h"
@@ skipping 114 matching lines @@
     fBytes -= size;
     if (resource->cacheAccess().isBudgeted()) {
         --fBudgetedCount;
         fBudgetedBytes -= size;
     }
 
     fResources.remove(resource);
     if (resource->cacheAccess().getScratchKey().isValid()) {
         fScratchMap.remove(resource->cacheAccess().getScratchKey(), resource);
     }
-    if (resource->cacheAccess().getContentKey().isValid()) {
-        fContentHash.remove(resource->cacheAccess().getContentKey());
+    if (resource->getContentKey().isValid()) {
+        fContentHash.remove(resource->getContentKey());
     }
     this->validate();
 }
 
 void GrResourceCache2::abandonAll() {
     AutoValidate av(this);
 
     SkASSERT(!fPurging);
     while (GrGpuResource* head = fResources.head()) {
         SkASSERT(!head->wasDestroyed());
@@ skipping 71 matching lines @@
 
 void GrResourceCache2::willRemoveScratchKey(const GrGpuResource* resource) {
     SkASSERT(resource->cacheAccess().getScratchKey().isValid());
     fScratchMap.remove(resource->cacheAccess().getScratchKey(), resource);
 }
 
 bool GrResourceCache2::didSetContentKey(GrGpuResource* resource) {
     SkASSERT(!fPurging);
     SkASSERT(resource);
     SkASSERT(this->isInCache(resource));
-    SkASSERT(resource->cacheAccess().getContentKey().isValid());
+    SkASSERT(resource->getContentKey().isValid());
 
-    GrGpuResource* res = fContentHash.find(resource->cacheAccess().getContentKey());
+    GrGpuResource* res = fContentHash.find(resource->getContentKey());
     if (NULL != res) {
         return false;
     }
 
     fContentHash.add(resource);
     this->validate();
     return true;
 }
 
 void GrResourceCache2::makeResourceMRU(GrGpuResource* resource) {
@@ skipping 33 matching lines @@
             }
         } else {
             release = true;
         }
     } else {
         // Purge the resource if we're over budget
         bool overBudget = fBudgetedCount > fMaxCount || fBudgetedBytes > fMaxBytes;
 
         // Also purge if the resource has neither a valid scratch key nor a content key.
         bool noKey = !resource->cacheAccess().getScratchKey().isValid() &&
-                     !resource->cacheAccess().getContentKey().isValid();
+                     !resource->getContentKey().isValid();
         if (overBudget || noKey) {
             release = true;
         }
     }
 
     if (release) {
         SkDEBUGCODE(int beforeCount = fCount;)
         resource->cacheAccess().release();
         // We should at least free this resource, perhaps dependent resources as well.
         SkASSERT(fCount < beforeCount);
@@ skipping 133 matching lines @@
     GrGpuResource* resource = iter.init(fResources, ResourceList::Iter::kHead_IterStart);
     for ( ; resource; resource = iter.next()) {
         bytes += resource->gpuMemorySize();
         ++count;
 
         if (!resource->isPurgeable()) {
             ++locked;
         }
 
         if (resource->cacheAccess().isScratch()) {
-            SkASSERT(!resource->cacheAccess().getContentKey().isValid());
+            SkASSERT(!resource->getContentKey().isValid());
             ++scratch;
             SkASSERT(fScratchMap.countForKey(resource->cacheAccess().getScratchKey()));
             SkASSERT(!resource->cacheAccess().isWrapped());
         } else if (resource->cacheAccess().getScratchKey().isValid()) {
             SkASSERT(!resource->cacheAccess().isBudgeted() ||
-                     resource->cacheAccess().getContentKey().isValid());
+                     resource->getContentKey().isValid());
             ++couldBeScratch;
             SkASSERT(fScratchMap.countForKey(resource->cacheAccess().getScratchKey()));
             SkASSERT(!resource->cacheAccess().isWrapped());
         }
-        const GrContentKey& contentKey = resource->cacheAccess().getContentKey();
+        const GrContentKey& contentKey = resource->getContentKey();
         if (contentKey.isValid()) {
             ++content;
             SkASSERT(fContentHash.find(contentKey) == resource);
             SkASSERT(!resource->cacheAccess().isWrapped());
             SkASSERT(resource->cacheAccess().isBudgeted());
         }
 
         if (resource->cacheAccess().isBudgeted()) {
             ++budgetedCount;
             budgetedBytes += resource->gpuMemorySize();
@@ skipping 56 matching lines @@
 
     SkDebugf("Budget: %d items %d bytes\n", fMaxCount, fMaxBytes);
     SkDebugf("\t\tEntry Count: current %d"
              " (%d budgeted, %d wrapped, %d locked, %d scratch %.2g%% full), high %d\n",
         fCount, fBudgetedCount, wrapped, locked, scratch, countUtilization, fHighWaterCount);
     SkDebugf("\t\tEntry Bytes: current %d (budgeted %d, %.2g%% full, %d unbudgeted) high %d\n",
                 fBytes, fBudgetedBytes, byteUtilization, unbudgetedSize, fHighWaterBytes);
 }
 
 #endif