fix mac build errors related to new gm

gm/canvasstate.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 63 matching lines @@
         for (size_t i = 0; i < SK_ARRAY_COUNT(flags); ++i) {
             for (int j = 0; j < 2; ++j) {
                 for (int k = 0; k < 2; ++k) {
                     this->drawTestPattern(i, (2*j)+k, canvas, flags[i], j, k);
                 }
             }
         }
     }
 
 
-    virtual uint32_t onGetFlags() SK_OVERRIDE const { return kSkipPicture_Flag; }
+    virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPicture_Flag; }
 
 private:
     void drawTestPattern(int x, int y, SkCanvas* canvas,
                          SkCanvas::SaveFlags flags, bool doClip, bool doScale) {
         canvas->save();
         canvas->translate(x*WIDTH, y*HEIGHT);
 
         canvas->drawRect(fOutlineRect, fStrokePaint);
         canvas->save(flags);
         if(doClip) {
             canvas->clipPath(fPath);
         }
         if (doScale) {
-            canvas->scale(0.5, 0.5);
+            canvas->scale(SkDoubleToScalar(0.5), SkDoubleToScalar(0.5));
         }
         canvas->restore();
         canvas->drawRect(fFillRect, fFillPaint);
 
         canvas->restore();
     }
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return SkNEW(CanvasStateGM); )
 
 } // end namespace