move SkImage::ColorType into SkColorType

src/lazy/SkLazyPixelRef.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkLazyPixelRef_DEFINED
 #define SkLazyPixelRef_DEFINED
 
@@ skipping 59 matching lines @@
 private:
     bool                        fErrorInDecoding;
     SkData*                     fData;
     SkBitmapFactory::DecodeProc fDecodeProc;
     SkImageCache*               fImageCache;
     union {
         SkImageCache::ID        fCacheId;
         SkScaledImageCache::ID* fScaledCacheId;
     };
     size_t                      fRowBytes;
-    SkImage::Info               fLazilyCachedInfo;
+    SkImageInfo                 fLazilyCachedInfo;
 
 #if LAZY_CACHE_STATS
     static int32_t              gCacheHits;
     static int32_t              gCacheMisses;
 #endif
 
     // lazily initialized our cached info. Returns NULL on failure.
     const SkImage::Info* getCachedInfo();
     void* lockScaledImageCachePixels();
     void* lockImageCachePixels();
 
 
     typedef SkPixelRef INHERITED;
 };
 
 #endif  // SkLazyPixelRef_DEFINED