move SkImage::ColorType into SkColorType

tests/DrawBitmapRectTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkPaint.h"
 #include "SkShader.h"
 #include "SkSurface.h"
 #include "SkRandom.h"
 #include "SkMatrixUtils.h"
 
 #include "SkLazyPixelRef.h"
 #include "SkLruImageCache.h"
 
 // A BitmapFactory that always fails when asked to return pixels.
-static bool FailureDecoder(const void* data, size_t length, SkImage::Info* info,
+static bool FailureDecoder(const void* data, size_t length, SkImageInfo* info,
                            const SkBitmapFactory::Target* target) {
     if (info) {
         info->fWidth = info->fHeight = 100;
-        info->fColorType = SkImage::kRGBA_8888_ColorType;
+        info->fColorType = kRGBA_8888_SkColorType;
         info->fAlphaType = kPremul_SkAlphaType;
     }
     // this will deliberately return false if they are asking us to decode
     // into pixels.
     return NULL == target;
 }
 
 // crbug.com/295895
 // Crashing in skia when a pixelref fails in lockPixels
 //
@@ skipping 283 matching lines @@
 
     test_nan_antihair();
     test_giantrepeat_crbug118018(reporter);
 
     test_treatAsSprite(reporter);
     test_faulty_pixelref(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("DrawBitmapRect", TestDrawBitmapRectClass, TestDrawBitmapRect)