Fix int/SkScalar mismatch in gm.

gm/xfermodes.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gm.h"
 #include "SkBitmap.h"
 #include "SkShader.h"
@@ skipping 64 matching lines @@
                    SkScalar x, SkScalar y) {
         SkPaint p;
         SkMatrix m;
         bool restoreNeeded = false;
         m.setTranslate(x, y);
 
         canvas->drawBitmapMatrix(fSrcB, m, &p);
         p.setXfermode(mode);
         switch (srcType) {
             case kQuarterClearInLayer_SrcType: {
-                SkRect bounds = SkRect::MakeXYWH(x, y, W, H);
+                SkRect bounds = SkRect::MakeXYWH(x, y, SkIntToScalar(W),
+                                                 SkIntToScalar(H));
                 canvas->saveLayer(&bounds, &p);
                 restoreNeeded = true;
                 p.setXfermodeMode(SkXfermode::kSrcOver_Mode);
                 // Fall through.
             }
             case kQuarterClear_SrcType: {
                 SkScalar halfW = SkIntToScalar(W) / 2;
                 SkScalar halfH = SkIntToScalar(H) / 2;
                 p.setColor(0xFF66AAFF);
-                SkRect r = SkRect::MakeXYWH(x + halfW, y, halfW, H);
+                SkRect r = SkRect::MakeXYWH(x + halfW, y, halfW,
+                                            SkIntToScalar(H));
                 canvas->drawRect(r, p);
                 p.setColor(0xFFAA66FF);
-                r = SkRect::MakeXYWH(x, y + halfH, W, halfH);
+                r = SkRect::MakeXYWH(x, y + halfH, SkIntToScalar(W), halfH);
                 canvas->drawRect(r, p);
                 break;
             }
             case kRectangle_SrcType: {
                 SkScalar w = SkIntToScalar(W);
                 SkScalar h = SkIntToScalar(H);
                 SkRect r = SkRect::MakeXYWH(x + w / 3, y + h / 3,
                                             w * 37 / 60, h * 37 / 60);
                 p.setColor(0xFF66AAFF);
                 canvas->drawRect(r, p);
@@ skipping 152 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new XfermodesGM; }
 static GMRegistry reg(MyFactory);
 
 }