use allocator (if present) when we allocate our cache bitmap

tests/SkResourceCacheTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "SkBitmapCache.h"
 #include "SkCanvas.h"
 #include "SkDiscardableMemoryPool.h"
 #include "SkGraphics.h"
 #include "SkResourceCache.h"
 #include "SkSurface.h"
 
-static const int kCanvasSize = 1;
-static const int kBitmapSize = 16;
-static const int kScale = 8;
-
-static bool is_in_scaled_image_cache(const SkBitmap& orig,
-                                     SkScalar xScale,
-                                     SkScalar yScale) {
-    SkBitmap scaled;
-    int width = SkScalarRoundToInt(orig.width() * xScale);
-    int height = SkScalarRoundToInt(orig.height() * yScale);
-    return SkBitmapCache::FindWH(SkBitmapCacheDesc::Make(orig, width, height), &scaled);
-}
-
-// Draw a scaled bitmap, then return true if it has been cached.
-static bool test_scaled_image_cache_usage() {
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(kCanvasSize, kCanvasSize));
-    SkCanvas* canvas = surface->getCanvas();
-    SkBitmap bitmap;
-    bitmap.allocN32Pixels(kBitmapSize, kBitmapSize);
-    bitmap.eraseColor(0xFFFFFFFF);
-    SkScalar xScale = SkIntToScalar(kScale);
-    SkScalar yScale = xScale / 2;
-    SkScalar xScaledSize = SkIntToScalar(kBitmapSize) * xScale;
-    SkScalar yScaledSize = SkIntToScalar(kBitmapSize) * yScale;
-    canvas->clipRect(SkRect::MakeLTRB(0, 0, xScaledSize, yScaledSize));
-    SkPaint paint;
-    paint.setFilterQuality(kHigh_SkFilterQuality);
-
-    canvas->drawBitmapRect(bitmap,
-                           SkRect::MakeLTRB(0, 0, xScaledSize, yScaledSize),
-                           &paint);
-
-    return is_in_scaled_image_cache(bitmap, xScale, yScale);
-}
-
-// http://crbug.com/389439
-DEF_TEST(ResourceCache_SingleAllocationByteLimit, reporter) {
-    size_t originalByteLimit = SkGraphics::GetResourceCacheTotalByteLimit();
-    size_t originalAllocationLimit =
-        SkGraphics::GetResourceCacheSingleAllocationByteLimit();
-
-    size_t size = kBitmapSize * kScale * kBitmapSize * kScale
-        * SkColorTypeBytesPerPixel(kN32_SkColorType);
-
-    SkGraphics::SetResourceCacheTotalByteLimit(0);  // clear cache
-    SkGraphics::SetResourceCacheTotalByteLimit(2 * size);
-    SkGraphics::SetResourceCacheSingleAllocationByteLimit(0);  // No limit
-
-    REPORTER_ASSERT(reporter, test_scaled_image_cache_usage());
-
-    SkGraphics::SetResourceCacheTotalByteLimit(0);  // clear cache
-    SkGraphics::SetResourceCacheTotalByteLimit(2 * size);
-    SkGraphics::SetResourceCacheSingleAllocationByteLimit(size * 2);  // big enough
-
-    REPORTER_ASSERT(reporter, test_scaled_image_cache_usage());
-
-    SkGraphics::SetResourceCacheTotalByteLimit(0);  // clear cache
-    SkGraphics::SetResourceCacheTotalByteLimit(2 * size);
-    SkGraphics::SetResourceCacheSingleAllocationByteLimit(size / 2);  // too small
-
-    REPORTER_ASSERT(reporter, !test_scaled_image_cache_usage());
-
-    SkGraphics::SetResourceCacheSingleAllocationByteLimit(originalAllocationLimit);
-    SkGraphics::SetResourceCacheTotalByteLimit(originalByteLimit);
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////
 
 static void make_bitmap(SkBitmap* bitmap, const SkImageInfo& info, SkBitmap::Allocator* allocator) {
     if (allocator) {
         bitmap->setInfo(info);
         allocator->allocPixelRef(bitmap, 0);
     } else {
         bitmap->allocPixels(info);
     }
 }
@@ skipping 169 matching lines @@
     REPORTER_ASSERT(reporter, SkBitmapCache::Find(cachedBitmap.getGenerationID(), rect, &bm, cache));
 
     // Finding more than once works fine.
     REPORTER_ASSERT(reporter, SkBitmapCache::Find(cachedBitmap.getGenerationID(), rect, &bm, cache));
     bm.unlockPixels();
 
     // Drop the pixels in the bitmap.
     if (factory) {
         REPORTER_ASSERT(reporter, SkGetGlobalDiscardableMemoryPool()->getRAMUsed() > 0);
         SkGetGlobalDiscardableMemoryPool()->dumpPool();
-        REPORTER_ASSERT(reporter, SkGetGlobalDiscardableMemoryPool()->getRAMUsed() == 0);
 
         // The bitmap is not in the cache since it has been dropped.
         REPORTER_ASSERT(reporter, !SkBitmapCache::Find(cachedBitmap.getGenerationID(), rect, &bm, cache));
     }
 
     make_bitmap(&cachedBitmap, SkImageInfo::MakeN32Premul(5, 5), allocator);
     cachedBitmap.setImmutable();
     cachedBitmap.unlockPixels();
 
     // We can add the bitmap back to the cache and find it again.
     REPORTER_ASSERT(reporter, SkBitmapCache::Add(cachedBitmap.pixelRef(), rect, cachedBitmap, cache));
     REPORTER_ASSERT(reporter, SkBitmapCache::Find(cachedBitmap.getGenerationID(), rect, &bm, cache));
 
     test_mipmapcache(reporter, cache);
     test_bitmap_notify(reporter, cache);
     test_mipmap_notify(reporter, cache);
 }