move SkImage::ColorType into SkColorType

src/lazy/SkBitmapFactory.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapFactory.h"
 
 #include "SkBitmap.h"
@@ skipping 30 matching lines @@
         SkSafeUnref(fImageCache);
         fImageCache = NULL;
     }
 }
 
 bool SkBitmapFactory::installPixelRef(SkData* data, SkBitmap* dst) {
     if (NULL == data || 0 == data->size() || dst == NULL) {
         return false;
     }
 
-    SkImage::Info info;
+    SkImageInfo info;
     if (!fDecodeProc(data->data(), data->size(), &info, NULL)) {
         return false;
     }
 
     SkBitmap::Config config = SkImageInfoToBitmapConfig(info);
 
     Target target;
     // FIMXE: There will be a problem if this rowbytes is calculated differently from
     // in SkLazyPixelRef.
     target.fRowBytes = SkImageMinRowBytes(info);
     dst->setConfig(config, info.fWidth, info.fHeight, target.fRowBytes, info.fAlphaType);
 
     // fImageCache and fCacheSelector are mutually exclusive.
     SkASSERT(NULL == fImageCache || NULL == fCacheSelector);
 
     SkImageCache* cache = NULL == fCacheSelector ? fImageCache : fCacheSelector->selectCache(info);
 
     if (cache != NULL) {
         // Now set a new LazyPixelRef on dst.
         SkAutoTUnref<SkLazyPixelRef> lazyRef(SkNEW_ARGS(SkLazyPixelRef,
                                                         (data, fDecodeProc, cache)));
         dst->setPixelRef(lazyRef);
         return true;
     } else {
         dst->allocPixels();
         target.fAddr = dst->getPixels();
         return fDecodeProc(data->data(), data->size(), &info, &target);
     }
 }