Big Cleanup: SkBitmapFactory, SkLazyPixelRef, SkImageCache

src/lazy/SkLazyCachingPixelRef.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Sk64.h"
 #include "SkColorTable.h"
 #include "SkData.h"
 #include "SkImageDecoder.h"
 #include "SkImagePriv.h"
 #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();
     } else {
         fData = data;
         fData->ref();
     }
     if (NULL == fDecodeProc) {  // use a reasonable default.
         fDecodeProc = SkImageDecoder::DecodeMemoryToTarget;
     }
@@ skipping 13 matching lines @@
 bool SkLazyCachingPixelRef::onDecodePixels(const SkImageInfo& passedInfo,
                                            void* pixels, size_t rowBytes) {
     SkASSERT(pixels);
     SkImageInfo info;
     if (!this->getInfo(&info)) {
         return false;
     }
     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)));
     return ref->configure(destination) && destination->setPixelRef(ref);
 }