fix mac build errors related to new gm

gm/canvasstate.cpp

Index: gm/canvasstate.cpp
diff --git a/gm/canvasstate.cpp b/gm/canvasstate.cpp
index 1a26bf0df7c1c194677dabdaefb6fea2062c8014..4dd403ca5c71f745a299a9c35ab7da2afceaeb4b 100644
--- a/gm/canvasstate.cpp
+++ b/gm/canvasstate.cpp
@@ -81,7 +81,7 @@ protected:
     }
 
 
-    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,
@@ -95,7 +95,7 @@ private:
             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);