Replace GrResourceCache with GrResourceCache2.

src/gpu/GrGpuResourceCacheAccess.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 GrGpuResourceCacheAccess_DEFINED
 #define GrGpuResourceCacheAccess_DEFINED
@@ skipping 11 matching lines @@
      * be converted to a content resource. Currently this may only be called once per resource. It
      * fails if there is already a resource with the same content key. TODO: make this supplant the
      * resource that currently is using the content key, allow resources' content keys to change,
      * and allow removal of a content key to convert a resource back to scratch.
      */
     bool setContentKey(const GrResourceKey& contentKey) {
         return fResource->setContentKey(contentKey);
     }
 
     /**
-     * Used by legacy cache to attach a cache entry. This is to be removed soon.
-     */
-    void setCacheEntry(GrResourceCacheEntry* cacheEntry) {
-        // GrResourceCache never changes the cacheEntry once one has been added.
-        SkASSERT(NULL == cacheEntry || NULL == fResource->fCacheEntry);
-        fResource->fCacheEntry = cacheEntry;
-    }
-
-    /**
-     * Is the resource in the legacy cache? This is to be removed soon.
-     */
-    bool isInCache() const { return SkToBool(fResource->fCacheEntry); }
-
-    /**
-     * Returns the cache entry for the legacy cache. This is to be removed soon.
-     */
-    GrResourceCacheEntry* getCacheEntry() const { return fResource->fCacheEntry; }
-
-    /**
      * Is the resource currently cached as scratch? This means it has a valid scratch key and does
      * not have a content key.
      */
     bool isScratch() const {
         SkASSERT(fResource->fScratchKey.isScratch());
         return NULL == this->getContentKey() && !fResource->fScratchKey.isNullScratch();
     }
 
     /** 
      * If this resource can be used as a scratch resource this returns a valid scratch key.
@@ skipping 26 matching lines @@
     friend class GrGpuResource; // to construct/copy this type.
 };
 
 inline GrGpuResource::CacheAccess GrGpuResource::cacheAccess() { return CacheAccess(this); }
 
 inline const GrGpuResource::CacheAccess GrGpuResource::cacheAccess() const {
     return CacheAccess(const_cast<GrGpuResource*>(this));
 }
 
 #endif