The key for SkBitmapCache can now be genID+SkIRect

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 "SkCanvas.h"
 #include "SkGraphics.h"
 #include "SkBitmapCache.h"
@@ skipping 54 matching lines @@
 
     SkGraphics::SetResourceCacheTotalByteLimit(0);  // clear cache
     SkGraphics::SetResourceCacheTotalByteLimit(2 * size);
     SkGraphics::SetResourceCacheSingleAllocationByteLimit(size / 2);  // too small
 
     REPORTER_ASSERT(reporter, !test_scaled_image_cache_useage());
 
     SkGraphics::SetResourceCacheSingleAllocationByteLimit(originalAllocationLimit);
     SkGraphics::SetResourceCacheTotalByteLimit(originalByteLimit);
 }
+
+static SkBitmap createAllocatedBitmap(const SkImageInfo& info) {
+    SkBitmap cachedBitmap;
+    cachedBitmap.setInfo(info);
+    SkBitmap::Allocator* allocator = SkBitmapCache::GetAllocator();
+    if (NULL != allocator) {
+        allocator->allocPixelRef(&cachedBitmap, 0);
+    } else {
+        cachedBitmap.allocPixels();
+    }
+
+    return cachedBitmap;
+}
+
+// http://skbug.com/2894
+DEF_TEST(BitmapCache_add_rect, reporter) {
+    SkBitmap bm;
+    SkIRect rect = SkIRect::MakeWH(5, 5);
+    SkBitmap cachedBitmap = createAllocatedBitmap(SkImageInfo::MakeN32Premul(5, 5));
+    cachedBitmap.setImmutable();
+
+
+    // Should not be in the cache
+    REPORTER_ASSERT(reporter, !SkBitmapCache::Find(cachedBitmap.getGenerationID(), rect, &bm));
+
+    SkBitmapCache::Add(cachedBitmap.getGenerationID(), rect, cachedBitmap);
+    // Should be in the cache, we just added it
+    REPORTER_ASSERT(reporter, SkBitmapCache::Find(cachedBitmap.getGenerationID(), rect, &bm));
+}
+DEF_TEST(BitmapCache_add_rect_canonicalize, reporter) {
+    SkBitmap bm;
+    SkIRect rect = SkIRect::MakeWH(5, 5);
+    SkBitmap cachedBitmap = createAllocatedBitmap(SkImageInfo::MakeN32Premul(5, 5));
+    cachedBitmap.setImmutable();
+
+
+    SkBitmapCache::Add(cachedBitmap.getGenerationID(), SkIRect::MakeEmpty(), cachedBitmap);
+    // Should not be in the cache, rect was empty when calling Add
+    REPORTER_ASSERT(reporter, !SkBitmapCache::Find(cachedBitmap.getGenerationID(), rect, &bm));
+
+    SkBitmapCache::Add(cachedBitmap.getGenerationID(), SkIRect::MakeWH(6, 6), cachedBitmap);
+    // Should be in the cache, we just added it and SkIRect(6, 6) has been canonicalized to SkIRect(5, 5)
+    REPORTER_ASSERT(reporter, SkBitmapCache::Find(cachedBitmap.getGenerationID(), rect, &bm));
+}