fix windows test error for CanvasStateTest.cpp

Review URL: https://codereview.chromium.org/23539005

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

diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index bb7d9e2b07d3a38d39daef8aa863cc7f06ebda79..c6756a732e9c3adb4579b96d69a88124b0747eaa 100644 (file)
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -21,7 +21,9 @@ static void test_complex_layers(skiatest::Reporter* reporter) {
     const int HEIGHT = 400;
     const int SPACER = 10;
 
-    SkRect rect = SkRect::MakeXYWH(SPACER, SPACER, WIDTH-(2*SPACER), (HEIGHT-(2*SPACER)) / 7);
+    SkRect rect = SkRect::MakeXYWH(SkIntToScalar(SPACER), SkIntToScalar(SPACER),
+                                   SkIntToScalar(WIDTH-(2*SPACER)),
+                                   SkIntToScalar((HEIGHT-(2*SPACER)) / 7));
 
     const SkBitmap::Config configs[] = { SkBitmap::kRGB_565_Config,
                                          SkBitmap::kARGB_8888_Config