Revert of Update Layer Hoisting to store its atlas texture in the resource cache

src/gpu/GrResourceCache.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 GrResourceCache_DEFINED
 #define GrResourceCache_DEFINED
@@ skipping 164 matching lines @@
      * provided here will be passed back to the callback. Note that the cache will attempt to purge
      * any resources newly freed by the callback.
      */
     void setOverBudgetCallback(PFOverBudgetCB overBudgetCB, void* data) {
         fOverBudgetCB = overBudgetCB;
         fOverBudgetData = data;
     }
 
     void notifyFlushOccurred();
 
-#if GR_CACHE_STATS
-    struct Stats {
-        int fTotal;
-        int fNumPurgeable;
-        int fNumNonPurgeable;
-
-        int fScratch;
-        int fExternal;
-        int fBorrowed;
-        int fAdopted;
-        size_t fUnbudgetedSize;
-
-        Stats() { this->reset(); }
-
-        void reset() {
-            fTotal = 0;
-            fNumPurgeable = 0;
-            fNumNonPurgeable = 0;
-            fScratch = 0;
-            fExternal = 0;
-            fBorrowed = 0;
-            fAdopted = 0;
-            fUnbudgetedSize = 0;
-        }
-
-        void update(GrGpuResource* resource) {
-            if (resource->cacheAccess().isScratch()) {
-                ++fScratch;
-            }
-            if (resource->cacheAccess().isExternal()) {
-                ++fExternal;
-            }
-            if (resource->cacheAccess().isBorrowed()) {
-                ++fBorrowed;
-            }
-            if (resource->cacheAccess().isAdopted()) {
-                ++fAdopted;
-            }
-            if (!resource->resourcePriv().isBudgeted()) {
-                fUnbudgetedSize += resource->gpuMemorySize();
-            }
-        }
-    };
-
-    void getStats(Stats*) const;
-
+#if GR_GPU_STATS
     void dumpStats(SkString*) const;
 #endif
 
     // This function is for unit testing and is only defined in test tools.
     void changeTimestamp(uint32_t newTimestamp);
 
     // Enumerates all cached resources and dumps their details to traceMemoryDump.
     void dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const;
 
 private:
@@ skipping 188 matching lines @@
 
     friend class GrGpuResource; // To access all the proxy inline methods.
     friend class GrResourceCache; // To create this type.
 };
 
 inline GrResourceCache::ResourceAccess GrResourceCache::resourceAccess() {
     return ResourceAccess(this);
 }
 
 #endif