Allow SkLazyPixelRef to use SkScaledImageCache

src/core/SkScaledImageCache.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkScaledImageCache_DEFINED
 #define SkScaledImageCache_DEFINED
 
@@ skipping 13 matching lines @@
  */
 class SkScaledImageCache {
 public:
     struct ID;
 
     /*
      *  The following static methods are thread-safe wrappers around a global
      *  instance of this cache.
      */
 
+    static ID* FindAndLock(uint32_t pixelGenerationID,

[reed1, 2013/10/24 21:07:04]

Probably could use a simple comment...

// Called if there is no scaling, and no subsetting (i.e. pixelOffset is 0).

[hal.canary, 2013/10/25 16:37:10]

Done.

+                           int32_t width,
+                           int32_t height,
+                           SkBitmap* scaled);

[reed1, 2013/10/24 21:07:04]

slightly confusing to call this 'scaled'. How about just bitmap or result?

[hal.canary, 2013/10/25 16:37:10]

Done.

+
     static ID* FindAndLock(const SkBitmap& original, SkScalar scaleX,
                            SkScalar scaleY, SkBitmap* scaled);
     static ID* FindAndLockMip(const SkBitmap& original, SkMipMap const**);
 
+
+    static ID* AddAndLock(uint32_t pixelGenerationID,
+                          int32_t width,
+                          int32_t height,
+                          const SkBitmap& scaled);
+
     static ID* AddAndLock(const SkBitmap& original, SkScalar scaleX,
                           SkScalar scaleY, const SkBitmap& scaled);
     static ID* AddAndLockMip(const SkBitmap& original, const SkMipMap*);
 
     static void Unlock(ID*);
 
     static size_t GetBytesUsed();
     static size_t GetByteLimit();
     static size_t SetByteLimit(size_t newLimit);
 
     ///////////////////////////////////////////////////////////////////////////
 
     SkScaledImageCache(size_t byteLimit);
     ~SkScaledImageCache();
 
     /**
      *  Search the cache for a scaled version of original. If found, return it
      *  in scaled, and return its ID pointer. Use the returned ptr to unlock
      *  the cache when you are done using scaled.
      *
      *  If a match is not found, scaled will be unmodifed, and NULL will be
      *  returned.
      */
+    ID* findAndLock(uint32_t pixelGenerationID,
+                    int32_t width,
+                    int32_t height,
+                    SkBitmap* scaled);
+
     ID* findAndLock(const SkBitmap& original, SkScalar scaleX,
                     SkScalar scaleY, SkBitmap* scaled);
     ID* findAndLockMip(const SkBitmap& original, SkMipMap const**);
 
     /**
      *  To add a new (scaled) bitmap to the cache, call AddAndLock. Use the
      *  returned ptr to unlock the cache when you are done using scaled.
      */
+    ID* addAndLock(uint32_t pixelGenerationID,
+                   int32_t width,
+                   int32_t height,
+                   const SkBitmap& scaled);
     ID* addAndLock(const SkBitmap& original, SkScalar scaleX,
                    SkScalar scaleY, const SkBitmap& scaled);
     ID* addAndLockMip(const SkBitmap& original, const SkMipMap*);
 
     /**
      *  Given a non-null ID ptr returned by either findAndLock or addAndLock,
      *  this releases the associated resources to be available to be purged
      *  if needed. After this, the cached bitmap should no longer be
      *  referenced by the caller.
      */
@@ skipping 29 matching lines @@
     // linklist management
     void moveToHead(Rec*);
     void addToHead(Rec*);
     void detach(Rec*);
 #ifdef SK_DEBUG
     void validate() const;
 #else
     void validate() const {}
 #endif
 };
-
 #endif