harden requirements on SkBitmapCache

BUG=skia:
R=humper@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/521433002

1 files changed, 14 insertions, 1 deletions

diff --git a/src/core/SkBitmapCache.h b/src/core/SkBitmapCache.h
index 2b2dfbbea4..74e8546353 100644
--- a/src/core/SkBitmapCache.h
+++ b/src/core/SkBitmapCache.h
@@ -9,17 +9,26 @@
 #define SkBitmapCache_DEFINED
 
 #include "SkScalar.h"
+#include "SkBitmap.h"
 
-class SkBitmap;
 class SkMipMap;
 
 class SkBitmapCache {
 public:
     /**
+     *  Use this allocator for bitmaps, so they can use ashmem when available.
+     */
+    static SkBitmap::Allocator* GetAllocator();
+
+    /**
      *  Search based on the src bitmap and inverse scales in X and Y. If found, returns true and
      *  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);
+    
+    /*
+     *  result must be marked isImmutable()
+     */
     static void Add(const SkBitmap& src, SkScalar invScaleX, SkScalar invScaleY,
                     const SkBitmap& result);
 
@@ -28,6 +37,10 @@ public:
      *  result will be set to the matching bitmap with its pixels already locked.
      */
     static bool Find(uint32_t genID, int width, int height, SkBitmap* result);
+
+    /*
+     *  result must be marked isImmutable()
+     */
     static void Add(uint32_t genID, int width, int height, const SkBitmap& result);
 };