Use GrResourceCache2 to service content key lookups

src/gpu/GrResourceCache.h

 
 /*
  * Copyright 2011 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 122 matching lines @@
     /**
      * Returns the number of bytes consumed by cached resources.
      */
     size_t getCachedResourceBytes() const { return fEntryBytes; }
 
     /**
      * Returns the number of cached resources.
      */
     int getCachedResourceCount() const { return fEntryCount; }
 
-    /**
-     *  Search for an entry with the same Key. If found, return it.
-     *  If not found, return null.
-     */
-    GrGpuResource* find(const GrResourceKey& key);
-
     void makeResourceMRU(GrGpuResource*);
 
     /** Called by GrGpuResources when they detects that they are newly purgable. */
     void notifyPurgable(const GrGpuResource*);
 
     /**
      *  Add the new resource to the cache (by creating a new cache entry based
      *  on the provided key and resource).
      *
      *  Ownership of the resource is transferred to the resource cache,
      *  which will unref() it when it is purged or deleted.
+     *
+     *  This can fail if the key is already taken, or the resource is already in
+     *  the cache.
      */
-    void addResource(const GrResourceKey& key, GrGpuResource* resource);
-
-    /**
-     * Determines if the cache contains an entry matching a key. If a matching
-     * entry exists but was detached then it will not be found.
-     */
-    bool hasKey(const GrResourceKey& key) const { return SkToBool(fCache.find(key)); }
+    bool addResource(const GrResourceKey& key, GrGpuResource* resource);
 
     /**
      * Notify the cache that the size of a resource has changed.
      */
     void didIncreaseResourceSize(const GrResourceCacheEntry*, size_t amountInc);
     void didDecreaseResourceSize(const GrResourceCacheEntry*, size_t amountDec);
 
     /**
      * Remove a resource from the cache and delete it!
      */
@@ skipping 84 matching lines @@
         GrResourceCache* fCache;
     };
 #else
     class GrAutoResourceCacheValidate {
     public:
         GrAutoResourceCacheValidate(GrResourceCache*) {}
     };
 #endif
 
 #endif