simplify bitmap scaler and cache

tests/SkResourceCacheTest.cpp

Index: tests/SkResourceCacheTest.cpp
diff --git a/tests/SkResourceCacheTest.cpp b/tests/SkResourceCacheTest.cpp
index 6314863e503a487a349f1e0a0066deecc225691a..cf8327fcdeccd8b2d135bcfa5fae29da70fa7f87 100644
--- a/tests/SkResourceCacheTest.cpp
+++ b/tests/SkResourceCacheTest.cpp
@@ -21,9 +21,9 @@ static bool is_in_scaled_image_cache(const SkBitmap& orig,
                                      SkScalar xScale,
                                      SkScalar yScale) {
     SkBitmap scaled;
-    float roundedImageWidth = SkScalarRoundToScalar(orig.width() * xScale);
-    float roundedImageHeight = SkScalarRoundToScalar(orig.height() * yScale);
-    return SkBitmapCache::Find(orig, roundedImageWidth, roundedImageHeight, &scaled);
+    int width = SkScalarRoundToInt(orig.width() * xScale);
+    int height = SkScalarRoundToInt(orig.height() * yScale);
+    return SkBitmapCache::FindWH(orig, width, height, &scaled);
 }
 
 // Draw a scaled bitmap, then return true if it has been cached.