Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / tests / PremulAlphaRoundTripTest.cpp

diff --git a/src/third_party/skia/tests/PremulAlphaRoundTripTest.cpp b/src/third_party/skia/tests/PremulAlphaRoundTripTest.cpp
index 1e655fb..ce45f16 100644 (file)
--- a/src/third_party/skia/tests/PremulAlphaRoundTripTest.cpp
+++ b/src/third_party/skia/tests/PremulAlphaRoundTripTest.cpp
@@ -58,9 +58,8 @@ static void fillCanvas(SkCanvas* canvas, SkColorType colorType, PackUnpremulProc
         }
     }
 
-    SkImageInfo info = bmp.info();
-    info.fColorType = colorType;
-    info.fAlphaType = kUnpremul_SkAlphaType;
+    const SkImageInfo info = SkImageInfo::Make(bmp.width(), bmp.height(),
+                                               colorType, kUnpremul_SkAlphaType);
     canvas->writePixels(info, bmp.getPixels(), bmp.rowBytes(), 0, 0);
 }
 
@@ -91,7 +90,8 @@ DEF_GPUTEST(PremulAlphaRoundTrip, reporter, factory) {
                     continue;
                 }
 
-                device.reset(SkGpuDevice::Create(context, info, 0));
+                device.reset(SkGpuDevice::Create(context, info,
+                                     SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType), 0));
 #else
                 continue;
 #endif