Sk_API for SkImageGenerator and SkInstallDiscardablePixelRef

src/lazy/SkDiscardablePixelRef.h

Index: src/lazy/SkDiscardablePixelRef.h
diff --git a/src/lazy/SkDiscardablePixelRef.h b/src/lazy/SkDiscardablePixelRef.h
index 78dcd66791f3d430da2676f57570f68218e832ca..fe2d4dedf86fa3f0c6229572a5c2a9b3d783c46c 100644
--- a/src/lazy/SkDiscardablePixelRef.h
+++ b/src/lazy/SkDiscardablePixelRef.h
@@ -9,43 +9,15 @@
 #define SkDiscardablePixelRef_DEFINED
 
 #include "SkDiscardableMemory.h"
-#include "SkPixelRef.h"
 #include "SkImageGenerator.h"
 #include "SkImageInfo.h"
-
-/**
- * An interface that allows a purgable PixelRef to re-decode an image.
- */
-
-typedef SkDiscardableMemory* (*SkDiscardableMemoryFactory)(size_t bytes);
-
+#include "SkPixelRef.h"
 
 class SkDiscardablePixelRef : public SkPixelRef {
 public:
-    /**
-     *  Takes ownership of SkImageGenerator.  If this method fails for
-     *  whatever reason, it will return false and immediatetely delete
-     *  the generator.  If it succeeds, it will modify destination
-     *  bitmap.
-     *
-     *  If Install fails or when the SkDiscardablePixelRef that is
-     *  installed into destination is destroyed, it will call
-     *  SkDELETE() on the generator.  Therefore, generator should be
-     *  allocated with SkNEW() or SkNEW_ARGS().
-     *
-     *  @param destination Upon success, this bitmap will be
-     *  configured and have a pixelref installed.
-     *
-     *  @param factory If not NULL, this object will be used as a
-     *  source of discardable memory when decoding.  If NULL, then
-     *  SkDiscardableMemory::Create() will be called.
-     *
-     *  @return true iff successful.
-     */
-    static bool Install(SkImageGenerator* generator,
-                        SkBitmap* destination,
-                        SkDiscardableMemory::Factory* factory = NULL);
-
+    friend bool SkInstallDiscardablePixelRef(SkImageGenerator*,

[mtklein, 2013/12/10 15:21:39]

I don't think it makes a functional difference, but this guy should probably go
down in private.  No particular need for users of this class to know it's
friends with SkInstallDiscardablePixelRef.  It's just funny to put it up front
here.

[hal.canary, 2013/12/10 15:45:30]

Done.

+                                             SkBitmap*,
+                                             SkDiscardableMemory::Factory*);
     SK_DECLARE_UNFLATTENABLE_OBJECT()
 
 protected: