commit 2b1155ac0da4537e6b7a152aa8965b1b671215ea
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 13 14:48:09 2013 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 13 14:48:09 2013 +0000
tree c16134bfccce0b90745f3464fd5b6400bb1d9b39
parent d4236574cfe4ec333d20e7a30f37e084168bb050

fix mac build errors related to new gm

Review URL: https://codereview.chromium.org/22937005

git-svn-id: http://skia.googlecode.com/svn/trunk@10690 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/canvasstate.cpp

diff --git a/gm/canvasstate.cpp b/gm/canvasstate.cpp
index 1a26bf0..4dd403c 100644
--- a/gm/canvasstate.cpp
+++ b/gm/canvasstate.cpp
@@ -81,7 +81,7 @@
     }
 
 
-    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 @@
             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);