fix build breakage for missing SkScalarToInt

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"
@@ skipping 76 matching lines @@
                                           bitmaps[0].getSize()));
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 static void test_complex_clips(skiatest::Reporter* reporter) {
 
     const int WIDTH = 400;
     const int HEIGHT = 400;
-    const SkScalar SPACER = SkIntToScalar(10);
+    const int SPACER = 10;
 
-    SkRect layerRect = SkRect::MakeWH(SkIntToScalar(WIDTH), SkIntToScalar(HEIGHT / 4));
+    SkIRect layerRect = SkIRect::MakeWH(WIDTH, HEIGHT / 4);
     layerRect.inset(2*SPACER, 2*SPACER);
 
-    SkRect clipRect = layerRect;
+    SkIRect clipRect = layerRect;
     clipRect.fRight = clipRect.fLeft + (clipRect.width() / 2) - (2*SPACER);
     clipRect.outset(SPACER, SPACER);
 
-    SkIRect regionBounds;
-    clipRect.roundIn(&regionBounds);
+    SkIRect regionBounds = clipRect;
     regionBounds.offset(clipRect.width() + (2*SPACER), 0);
 
     SkIRect regionInterior = regionBounds;
     regionInterior.inset(SPACER*3, SPACER*3);
 
     SkRegion clipRegion;
     clipRegion.setRect(regionBounds);
     clipRegion.op(regionInterior, SkRegion::kDifference_Op);
 
 
@@ skipping 13 matching lines @@
         bitmaps[i].setConfig(SkBitmap::kARGB_8888_Config, WIDTH, HEIGHT);
         bitmaps[i].allocPixels();
 
         SkCanvas canvas(bitmaps[i]);
 
         canvas.drawColor(SK_ColorRED);
 
         SkRegion localRegion = clipRegion;
 
         for (int j = 0; j < layerCombinations; ++j) {
-            canvas.saveLayerAlpha(&layerRect, 128, flags[j]);
+            SkRect layerBounds = SkRect::Make(layerRect);
+            canvas.saveLayerAlpha(&layerBounds, 128, flags[j]);
 
             SkCanvasState* state = NULL;
             SkCanvas* tmpCanvas = NULL;
             if (i) {
                 state = SkCanvasStateUtils::CaptureCanvasState(&canvas);
                 REPORTER_ASSERT(reporter, state);
                 tmpCanvas = SkCanvasStateUtils::CreateFromCanvasState(state);
                 REPORTER_ASSERT(reporter, tmpCanvas);
             } else {
                 tmpCanvas = SkRef(&canvas);
             }
 
             tmpCanvas->save();
-            tmpCanvas->clipRect(clipRect, clipOps[j]);
+            tmpCanvas->clipRect(SkRect::Make(clipRect), clipOps[j]);
             tmpCanvas->drawColor(SK_ColorBLUE);
             tmpCanvas->restore();
 
             tmpCanvas->clipRegion(localRegion, clipOps[j]);
             tmpCanvas->drawColor(SK_ColorBLUE);
 
             tmpCanvas->unref();
             SkCanvasStateUtils::ReleaseCanvasState(state);
 
             canvas.restore();
 
             // translate the canvas and region for the next iteration
-            canvas.translate(0, 2*(layerRect.height() + SPACER));
+            canvas.translate(0, SkIntToScalar(2*(layerRect.height() + (SPACER))));
             localRegion.translate(0, 2*(layerRect.height() + SPACER));
         }
     }
 
     // now we memcmp the two bitmaps
     REPORTER_ASSERT(reporter, bitmaps[0].getSize() == bitmaps[1].getSize());
     REPORTER_ASSERT(reporter, !memcmp(bitmaps[0].getPixels(),
                                       bitmaps[1].getPixels(),
                                       bitmaps[0].getSize()));
 }
@@ skipping 43 matching lines @@
 
 static void test_canvas_state_utils(skiatest::Reporter* reporter) {
     test_complex_layers(reporter);
     test_complex_clips(reporter);
     test_draw_filters(reporter);
     test_soft_clips(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("CanvasState", TestCanvasStateClass, test_canvas_state_utils)