simplify bitmap scaler and cache

src/core/SkBitmapCache.h

Index: src/core/SkBitmapCache.h
diff --git a/src/core/SkBitmapCache.h b/src/core/SkBitmapCache.h
index 3e541eed2c57f7c2d54bd5142fa72d7ae9c27e26..8eee59dbf68f9dddd7cd346d17bf0aaff18e8114 100644
--- a/src/core/SkBitmapCache.h
+++ b/src/core/SkBitmapCache.h
@@ -30,14 +30,14 @@ public:
      *  Search based on the src bitmap and inverse scales in X and Y. If found, returns true and

[f(malita), 2015/08/31 22:08:12]

Nit: comment still references inverse scales.

[reed1, 2015/08/31 22:11:10]

Done.

      *  result will be set to the matching bitmap with its pixels already locked.
      */
-    static bool Find(const SkBitmap& src, SkScalar invScaleX, SkScalar invScaleY, SkBitmap* result,
-                     SkResourceCache* localCache = nullptr);
+    static bool FindWH(const SkBitmap& src, int width, int height, SkBitmap* result,
+                       SkResourceCache* localCache = nullptr);
 
     /*
      *  result must be marked isImmutable()
      */
-    static void Add(const SkBitmap& src, SkScalar invScaleX, SkScalar invScaleY,
-            const SkBitmap& result, SkResourceCache* localCache = nullptr);
+    static void AddWH(const SkBitmap& src, int width, int height, const SkBitmap& result,
+                      SkResourceCache* localCache = nullptr);
 
     /**
      *  Search based on the bitmap's genID and subset. If found, returns true and