fix windows test error for CanvasStateTest.cpp

tests/CanvasStateTest.cpp

 
 /*
  * Copyright 2013 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 "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkCanvasStateUtils.h"
 #include "SkDrawFilter.h"
 #include "SkPaint.h"
 #include "SkRect.h"
 #include "SkRRect.h"
 
 static void test_complex_layers(skiatest::Reporter* reporter) {
 
     const int WIDTH = 400;
     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
     };
     const int configCount = sizeof(configs) / sizeof(SkBitmap::Config);
 
     const int layerAlpha[] = { 255, 255, 0 };
     const SkCanvas::SaveFlags flags[] = { SkCanvas::kARGB_NoClipLayer_SaveFlag,
                                           SkCanvas::kARGB_ClipLayer_SaveFlag,
                                           SkCanvas::kARGB_NoClipLayer_SaveFlag
@@ skipping 96 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 static void test_canvas_state_utils(skiatest::Reporter* reporter) {
     test_complex_layers(reporter);
     test_draw_filters(reporter);
     test_soft_clips(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("CanvasState", TestCanvasStateClass, test_canvas_state_utils)