move SkImage::ColorType into SkColorType

platform_tools/android/examples/hello_skia_app/jni/helloskia.cpp

 #include <math.h>
 #include <jni.h>
 #include <android/bitmap.h>
 
 #include "SkCanvas.h"
 #include "SkGraphics.h"
 #include "SkSurface.h"
 #include "SkString.h"
 #include "SkTime.h"
 
 
 /**
  * Draws something into the given bitmap
  * @param  env
  * @param  thiz
  * @param  dstBitmap   The bitmap to place the results of skia into
  * @param  elapsedTime The number of milliseconds since the app was started
  */
 extern "C"
 JNIEXPORT void JNICALL Java_com_example_HelloSkiaActivity_drawIntoBitmap(JNIEnv* env,
         jobject thiz, jobject dstBitmap, jlong elapsedTime)
 {
     // Grab the dst bitmap info and pixels
     AndroidBitmapInfo dstInfo;
     void* dstPixels;
     AndroidBitmap_getInfo(env, dstBitmap, &dstInfo);
     AndroidBitmap_lockPixels(env, dstBitmap, &dstPixels);
 
-    SkImage::Info info = {
-        dstInfo.width, dstInfo.height, SkImage::kPMColor_ColorType,kPremul_SkAlphaType
+    SkImageInfo info = {
+        dstInfo.width, dstInfo.height, kPMColor_SkColorType, kPremul_SkAlphaType
     };
 
     // Create a surface from the given bitmap
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterDirect(info, dstPixels, dstInfo.stride));
     SkCanvas* canvas = surface->getCanvas();
 
     // Draw something "interesting"
 
     // Clear the canvas with a white color
     canvas->drawColor(SK_ColorWHITE);
@@ skipping 22 matching lines @@
         float x = (float)i / 99.0f;
         float offset = elapsedTime / 1000.0f;
         canvas->drawLine(sin(x * M_PI + offset) * 800.0f, 0,   // first endpoint
                          cos(x * M_PI + offset) * 800.0f, 800, // second endpoint
                          paint);                               // SkPapint to tell how to draw the line
     }
 
     // Unlock the dst's pixels
     AndroidBitmap_unlockPixels(env, dstBitmap);
 }