move SkImage::ColorType into SkColorType

tools/LazyDecodeBitmap.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 "LazyDecodeBitmap.h"
 
 #include "PictureRenderingFlags.h"  // --deferImageDecoding is defined here.
@@ skipping 22 matching lines @@
 
 public:
     CacheSelector() {
         fPurgeableImageCache = SkPurgeableImageCache::Create();
     }
 
     ~CacheSelector() {
         SkSafeUnref(fPurgeableImageCache);
     }
 
-    virtual SkImageCache* selectCache(const SkImage::Info& info) SK_OVERRIDE {
+    virtual SkImageCache* selectCache(const SkImageInfo& info) SK_OVERRIDE {
         if (info.fWidth * info.fHeight > 32 * 1024 && fPurgeableImageCache != NULL) {
             return fPurgeableImageCache;
         }
         return &gLruImageCache;
     }
 private:
     SkImageCache* fPurgeableImageCache;
 };
 
 static CacheSelector gCacheSelector;
@@ skipping 13 matching lines @@
             gFactory.setCacheSelector(&gCacheSelector);
         } else {
             gFactory.setImageCache(&gLruImageCache);
         }
         gOnce = true;
     }
     return gFactory.installPixelRef(data, bitmap);
 }
 
 }  // namespace sk_tools