diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-08 18:44:01 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-08 18:44:01 +0000 |
commit | 27b90fae0e0ea159c2d2fe4b028be5859258267a (patch) | |
tree | a3025ad5eab73278593e16d2dd0e44e0268c0912 | |
parent | 8819d1af94a187337622b13b8e5ab7e949472a62 (diff) |
update to use DEF_GM
git-svn-id: http://skia.googlecode.com/svn/trunk@8048 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | gm/cubicpaths.cpp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp index 1fc13c06cf..88f7ab15c5 100644 --- a/gm/cubicpaths.cpp +++ b/gm/cubicpaths.cpp @@ -9,9 +9,7 @@ #include "SkPaint.h" #include "SkRandom.h" -namespace skiagm { - -class CubicPathGM : public GM { +class CubicPathGM : public skiagm::GM { public: CubicPathGM() {} @@ -20,7 +18,7 @@ protected: return SkString("cubicpath"); } - SkISize onISize() { return make_isize(1240, 390); } + SkISize onISize() { return SkISize::Make(1240, 390); } void drawPath(SkPath& path,SkCanvas* canvas,SkColor color, const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join, @@ -151,10 +149,10 @@ protected: } private: - typedef GM INHERITED; + typedef skiagm::GM INHERITED; }; -class CubicClosePathGM : public GM { +class CubicClosePathGM : public skiagm::GM { public: CubicClosePathGM() {} @@ -163,7 +161,7 @@ protected: return SkString("cubicclosepath"); } - SkISize onISize() { return make_isize(1240, 390); } + SkISize onISize() { return SkISize::Make(1240, 390); } void drawPath(SkPath& path,SkCanvas* canvas,SkColor color, const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join, @@ -295,15 +293,11 @@ protected: } private: - typedef GM INHERITED; + typedef skiagm::GM INHERITED; }; ////////////////////////////////////////////////////////////////////////////// -static GM* CubicPathFactory(void*) { return new CubicPathGM; } -static GMRegistry regCubicPath(CubicPathFactory); - -static GM* CubicClosePathFactory(void*) { return new CubicClosePathGM; } -static GMRegistry regCubicClosePath(CubicClosePathFactory); +DEF_GM( return new CubicPathGM; ) +DEF_GM( return new CubicClosePathGM; ) -} |