Big Cleanup: SkBitmapFactory, SkLazyPixelRef, SkImageCache

src/lazy/SkDiscardablePixelRef.cpp

Index: src/lazy/SkDiscardablePixelRef.cpp
diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp
index b6e1b1004ed7096fc180be5945aa44e5dfab1c1c..1a3e3600486ebb9b92428f0f0baf22a7d7ba738d 100644
--- a/src/lazy/SkDiscardablePixelRef.cpp
+++ b/src/lazy/SkDiscardablePixelRef.cpp
@@ -11,8 +11,10 @@
 SkDiscardablePixelRef::SkDiscardablePixelRef(SkImageGenerator* generator,
                                              const SkImageInfo& info,
                                              size_t size,
-                                             size_t rowBytes)
+                                             size_t rowBytes,
+                                             SkDiscardableMemory::Factory* fact)
     : fGenerator(generator)
+    , fDMFactory(fact)
     , fInfo(info)
     , fSize(size)
     , fRowBytes(rowBytes)
@@ -20,9 +22,11 @@ SkDiscardablePixelRef::SkDiscardablePixelRef(SkImageGenerator* generator,
     SkASSERT(fGenerator != NULL);
     SkASSERT(fSize > 0);
     SkASSERT(fRowBytes > 0);
+    SkSafeRef(fDMFactory);
 }
 
 SkDiscardablePixelRef::~SkDiscardablePixelRef() {
+    SkSafeUnref(fDMFactory);
     SkDELETE(fGenerator);
 }
 
@@ -33,7 +37,11 @@ void* SkDiscardablePixelRef::onLockPixels(SkColorTable**) {
         }
         fDiscardableMemory = NULL;
     }
-    fDiscardableMemory = SkDiscardableMemory::Create(fSize);
+    if (fDMFactory != NULL) {
+        fDiscardableMemory = fDMFactory->create(fSize);
+    } else {
+        fDiscardableMemory = SkDiscardableMemory::Create(fSize);
+    }
     if (NULL == fDiscardableMemory) {
         return NULL;  // Memory allocation failed.
     }
@@ -50,19 +58,22 @@ void SkDiscardablePixelRef::onUnlockPixels() {
 }
 
 bool SkDiscardablePixelRef::Install(SkImageGenerator* generator,
-                                    SkBitmap* dst) {
+                                    SkBitmap* dst,
+                                    SkDiscardableMemory::Factory* factory) {
     SkImageInfo info;
     SkASSERT(generator != NULL);
     if ((NULL == generator)
         || (!generator->getInfo(&info))
-        || (!dst->setConfig(info, 0))) {
+        || (!dst->setConfig(info, 0))
+        || (0 == dst->getSize())) {  // dst->getSize=0 Probably a bad config
         SkDELETE(generator);
         return false;
     }
     SkAutoTUnref<SkDiscardablePixelRef> ref(SkNEW_ARGS(SkDiscardablePixelRef,
                                                    (generator, info,
                                                     dst->getSize(),
-                                                    dst->rowBytes())));
+                                                    dst->rowBytes(),
+                                                    factory)));
     dst->setPixelRef(ref);
     return true;
 }