retool image cache to be generic cache

src/core/SkBitmapCache.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 SkBitmapCache_DEFINED
 #define SkBitmapCache_DEFINED
 
 #include "SkScaledImageCache.h"

[Stephen White, 2014/08/26 14:25:08]

Not new to this patch, but I'm a little confused by this dependency. Is this
because it's pending a rename? Shouldn't the SkBitmapCache be the base class,
and SkScaledImageCache its client?

[reed1, 2014/08/26 14:45:02]

BitmapCache is a specialization of our (yet to be renamed) general cache
(currently named ScaledImageCache, but that will change).

 
 class SkBitmapCache {
 public:
     typedef SkScaledImageCache::ID ID;
 
-    static void Unlock(ID* id) {
-        SkScaledImageCache::Unlock(id);
-    }
-
     /* Input: bitmap+inverse_scale */
-    static ID* FindAndLock(const SkBitmap& src, SkScalar invScaleX, SkScalar invScaleY,
+    static ID FindAndLock(const SkBitmap& src, SkScalar invScaleX, SkScalar invScaleY,
                            SkBitmap* result);
-    static ID* AddAndLock(const SkBitmap& src, SkScalar invScaleX, SkScalar invScaleY,
+    static ID AddAndLock(const SkBitmap& src, SkScalar invScaleX, SkScalar invScaleY,
                           const SkBitmap& result);
 
     /* Input: bitmap_genID+width+height */
-    static ID* FindAndLock(uint32_t genID, int width, int height, SkBitmap* result);
+    static ID FindAndLock(uint32_t genID, int width, int height, SkBitmap* result);
 
-    static ID* AddAndLock(uint32_t genID, int width, int height, const SkBitmap& result);
+    static ID AddAndLock(uint32_t genID, int width, int height, const SkBitmap& result);
 };
 
 class SkMipMapCache {
 public:
     typedef SkScaledImageCache::ID ID;
 
-    static void Unlock(ID* id) {
-        SkScaledImageCache::Unlock(id);
-    }
-
-    static ID* FindAndLock(const SkBitmap& src, const SkMipMap** result);
-    static ID* AddAndLock(const SkBitmap& src, const SkMipMap* result);
+    static ID FindAndLock(const SkBitmap& src, const SkMipMap** result);
+    static ID AddAndLock(const SkBitmap& src, const SkMipMap* result);
 };
 
 #endif