use new globally scoped SkAlphaType

git-svn-id: http://skia.googlecode.com/svn/trunk@11424 2bbb7eff-a529-9590-31e7-b0007b416f81

debugger/QT/SkImageWidget.cpp

@@ -20,7 +20,7 @@ SkImageWidget::SkImageWidget(SkDebugger *debugger)
     info.fWidth = kImageWidgetWidth;
     info.fHeight = kImageWidgetHeight;
     info.fColorType = SkImage::kPMColor_ColorType;
-    info.fAlphaType = SkImage::kPremul_AlphaType;
+    info.fAlphaType = kPremul_SkAlphaType;
 
     fSurface = SkSurface::NewRasterDirect(info, fPixels, 4 * kImageWidgetWidth);
 }

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

@@ -27,7 +27,7 @@ JNIEXPORT void JNICALL Java_com_example_HelloSkiaActivity_drawIntoBitmap(JNIEnv*
     AndroidBitmap_lockPixels(env, dstBitmap, &dstPixels);
 
     SkImage::Info info = {
-        dstInfo.width, dstInfo.height, SkImage::kPMColor_ColorType, SkImage::kPremul_AlphaType
+        dstInfo.width, dstInfo.height, SkImage::kPMColor_ColorType,kPremul_SkAlphaType
     };
 
     // Create a surface from the given bitmap