Big Cleanup: SkBitmapFactory, SkLazyPixelRef, SkImageCache

src/lazy/SkLazyCachingPixelRef.cpp

Index: src/lazy/SkLazyCachingPixelRef.cpp
diff --git a/src/lazy/SkLazyCachingPixelRef.cpp b/src/lazy/SkLazyCachingPixelRef.cpp
index 730b5f7d27db8874becd65a01680292a5cdc5576..c4847f4718a90e2991f5f781794539df3192b85b 100644
--- a/src/lazy/SkLazyCachingPixelRef.cpp
+++ b/src/lazy/SkLazyCachingPixelRef.cpp
@@ -13,8 +13,7 @@
 #include "SkLazyCachingPixelRef.h"
 #include "SkPostConfig.h"
 
-SkLazyCachingPixelRef::SkLazyCachingPixelRef(SkData* data,
-                                             SkBitmapFactory::DecodeProc proc)
+SkLazyCachingPixelRef::SkLazyCachingPixelRef(SkData* data, DecodeProc proc)
     : fDecodeProc(proc) {
     if (NULL == data) {
         fData = SkData::NewEmpty();
@@ -48,12 +47,11 @@ bool SkLazyCachingPixelRef::onDecodePixels(const SkImageInfo& passedInfo,
     if (passedInfo != info) {
         return false;  // This implementation can not handle this case.
     }
-    SkBitmapFactory::Target target = {pixels, rowBytes};
+    SkImageDecoder::Target target = {pixels, rowBytes};
     return fDecodeProc(fData->data(), fData->size(), &info, &target);
 }
 
-bool SkLazyCachingPixelRef::Install(SkBitmapFactory::DecodeProc proc,
-                                    SkData* data,
+bool SkLazyCachingPixelRef::Install(DecodeProc proc, SkData* data,
                                     SkBitmap* destination) {
     SkAutoTUnref<SkLazyCachingPixelRef> ref(
         SkNEW_ARGS(SkLazyCachingPixelRef, (data, proc)));