Removing unnecessary gm tests. Unreviewed but approved by reed@google.com.

TEST=Test coverage now in unit tests.

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

1 files changed, 0 insertions, 585 deletions

diff --git a/gm/movepaths.cpp b/gm/movepaths.cpp
deleted file mode 100644
index 30a5dfded3..0000000000
--- a/gm/movepaths.cpp
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * 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 "SkCanvas.h"
-#include "SkPaint.h"
-#include "SkRandom.h"
-
-namespace skiagm {
-
-class MovePathGM : public GM {
-public:
-    MovePathGM() {}
-
-protected:
-    SkString onShortName() {
-        return SkString("movepath");
-    }
-        
-    SkISize onISize() { return make_isize(1240, 390); }
-    
-    void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
-                  const SkRect& clip,SkPaint::Cap cap,
-                  SkPaint::Style style, SkPath::FillType fill,
-                  SkScalar strokeWidth) {
-        path.setFillType(fill);
-        SkPaint paint;
-        paint.setStrokeCap(cap);
-        paint.setStrokeWidth(strokeWidth);
-        paint.setColor(color);
-        paint.setStyle(style);
-        canvas->save();
-        canvas->clipRect(clip);
-        canvas->drawPath(path, paint);
-        canvas->restore();
-    }
-    
-    virtual void onDraw(SkCanvas* canvas) {
-        struct FillAndName {
-            SkPath::FillType fFill;
-            const char*      fName;
-        };
-        static const FillAndName gFills[] = {
-            {SkPath::kWinding_FillType, "Winding"},
-            {SkPath::kEvenOdd_FillType, "Even / Odd"},
-            {SkPath::kInverseWinding_FillType, "Inverse Winding"},
-            {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
-        };
-        struct StyleAndName {
-            SkPaint::Style fStyle;
-            const char*    fName;
-        };
-        static const StyleAndName gStyles[] = {
-            {SkPaint::kFill_Style, "Fill"},
-            {SkPaint::kStroke_Style, "Stroke"},
-            {SkPaint::kStrokeAndFill_Style, "Stroke And Fill"},
-        };
-        struct CapAndName {
-            SkPaint::Cap fCap;
-            const char*  fName;
-        };
-        static const CapAndName gCaps[] = {
-            {SkPaint::kButt_Cap, "Butt"},
-            {SkPaint::kRound_Cap, "Round"},
-            {SkPaint::kSquare_Cap, "Square"},
-        };
-        struct PathAndName {
-            SkPath      fPath;
-            const char* fName;
-        };
-        PathAndName path;
-        path.fPath.moveTo(50*SK_Scalar1, 15*SK_Scalar1);
-        path.fName = "moveTo";
-
-        SkPaint titlePaint;
-        titlePaint.setColor(SK_ColorBLACK);
-        titlePaint.setAntiAlias(true);
-        titlePaint.setLCDRenderText(true);
-        titlePaint.setTextSize(15 * SK_Scalar1);
-        const char title[] = "Lone Move Drawn Into Rectangle Clips With "
-                             "Indicated Style, Fill and Linecaps, with stroke width 10";
-        canvas->drawText(title, strlen(title),
-                            20 * SK_Scalar1,
-                            20 * SK_Scalar1,
-                            titlePaint);
-
-        SkRandom rand;
-        SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
-        canvas->save();
-        canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
-        canvas->save();
-        for (size_t cap = 0; cap < SK_ARRAY_COUNT(gCaps); ++cap) {
-            if (0 < cap) {
-                canvas->translate((rect.width() + 40 * SK_Scalar1) * SK_ARRAY_COUNT(gStyles), 0);
-            }
-            canvas->save();
-            for (size_t fill = 0; fill < SK_ARRAY_COUNT(gFills); ++fill) {
-                if (0 < fill) {
-                    canvas->translate(0, rect.height() + 40 * SK_Scalar1);
-                }
-                canvas->save();
-                for (size_t style = 0; style < SK_ARRAY_COUNT(gStyles); ++style) {
-                    if (0 < style) {
-                        canvas->translate(rect.width() + 40 * SK_Scalar1, 0);
-                    }
-        
-                    SkColor color = 0xff007000;
-                    this->drawPath(path.fPath, canvas, color, rect,
-                                    gCaps[cap].fCap, gStyles[style].fStyle,
-                                    gFills[fill].fFill, SK_Scalar1*10);
-        
-                    SkPaint rectPaint;
-                    rectPaint.setColor(SK_ColorBLACK);
-                    rectPaint.setStyle(SkPaint::kStroke_Style);
-                    rectPaint.setStrokeWidth(-1);
-                    rectPaint.setAntiAlias(true);
-                    canvas->drawRect(rect, rectPaint);
-        
-                    SkPaint labelPaint;
-                    labelPaint.setColor(color);
-                    labelPaint.setAntiAlias(true);
-                    labelPaint.setLCDRenderText(true);
-                    labelPaint.setTextSize(10 * SK_Scalar1);
-                    canvas->drawText(gStyles[style].fName,
-                                        strlen(gStyles[style].fName),
-                                        0, rect.height() + 12 * SK_Scalar1,
-                                        labelPaint);
-                    canvas->drawText(gFills[fill].fName,
-                                        strlen(gFills[fill].fName),
-                                        0, rect.height() + 24 * SK_Scalar1,
-                                        labelPaint);
-                    canvas->drawText(gCaps[cap].fName,
-                                        strlen(gCaps[cap].fName),
-                                        0, rect.height() + 36 * SK_Scalar1,
-                                        labelPaint);
-                }
-                canvas->restore();
-            }
-            canvas->restore();
-        }
-        canvas->restore();
-        canvas->restore();
-    }
-    
-private:
-    typedef GM INHERITED;
-};
-
-class MoveClosePathGM : public GM {
-public:
-    MoveClosePathGM() {}
-
-protected:
-    SkString onShortName() {
-        return SkString("moveclosepath");
-    }
-        
-    SkISize onISize() { return make_isize(1240, 390); }
-    
-    void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
-                  const SkRect& clip,SkPaint::Cap cap,
-                  SkPaint::Style style, SkPath::FillType fill,
-                  SkScalar strokeWidth) {
-        path.setFillType(fill);
-        SkPaint paint;
-        paint.setStrokeCap(cap);
-        paint.setStrokeWidth(strokeWidth);
-        paint.setColor(color);
-        paint.setStyle(style);
-        canvas->save();
-        canvas->clipRect(clip);
-        canvas->drawPath(path, paint);
-        canvas->restore();
-    }
-    
-    virtual void onDraw(SkCanvas* canvas) {
-        struct FillAndName {
-            SkPath::FillType fFill;
-            const char*      fName;
-        };
-        static const FillAndName gFills[] = {
-            {SkPath::kWinding_FillType, "Winding"},
-            {SkPath::kEvenOdd_FillType, "Even / Odd"},
-            {SkPath::kInverseWinding_FillType, "Inverse Winding"},
-            {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
-        };
-        struct StyleAndName {
-            SkPaint::Style fStyle;
-            const char*    fName;
-        };
-        static const StyleAndName gStyles[] = {
-            {SkPaint::kFill_Style, "Fill"},
-            {SkPaint::kStroke_Style, "Stroke"},
-            {SkPaint::kStrokeAndFill_Style, "Stroke And Fill"},
-        };
-        struct CapAndName {
-            SkPaint::Cap fCap;
-            const char*  fName;
-        };
-        static const CapAndName gCaps[] = {
-            {SkPaint::kButt_Cap, "Butt"},
-            {SkPaint::kRound_Cap, "Round"},
-            {SkPaint::kSquare_Cap, "Square"},
-        };
-        struct PathAndName {
-            SkPath      fPath;
-            const char* fName;
-        };
-        PathAndName path;
-        path.fPath.moveTo(50*SK_Scalar1, 15*SK_Scalar1);
-        path.fPath.close();
-        path.fName = "moveTo-close";
-
-        SkPaint titlePaint;
-        titlePaint.setColor(SK_ColorBLACK);
-        titlePaint.setAntiAlias(true);
-        titlePaint.setLCDRenderText(true);
-        titlePaint.setTextSize(15 * SK_Scalar1);
-        const char title[] = "Move Close Drawn Into Rectangle Clips With "
-                             "Indicated Style, Fill and Linecaps, with stroke width 10";
-        canvas->drawText(title, strlen(title),
-                            20 * SK_Scalar1,
-                            20 * SK_Scalar1,
-                            titlePaint);
-
-        SkRandom rand;
-        SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
-        canvas->save();
-        canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
-        canvas->save();
-        for (size_t cap = 0; cap < SK_ARRAY_COUNT(gCaps); ++cap) {
-            if (0 < cap) {
-                canvas->translate((rect.width() + 40 * SK_Scalar1) * SK_ARRAY_COUNT(gStyles), 0);
-            }
-            canvas->save();
-            for (size_t fill = 0; fill < SK_ARRAY_COUNT(gFills); ++fill) {
-                if (0 < fill) {
-                    canvas->translate(0, rect.height() + 40 * SK_Scalar1);
-                }
-                canvas->save();
-                for (size_t style = 0; style < SK_ARRAY_COUNT(gStyles); ++style) {
-                    if (0 < style) {
-                        canvas->translate(rect.width() + 40 * SK_Scalar1, 0);
-                    }
-        
-                    SkColor color = 0xff007000;
-                    this->drawPath(path.fPath, canvas, color, rect,
-                                    gCaps[cap].fCap, gStyles[style].fStyle,
-                                    gFills[fill].fFill, SK_Scalar1*10);
-        
-                    SkPaint rectPaint;
-                    rectPaint.setColor(SK_ColorBLACK);
-                    rectPaint.setStyle(SkPaint::kStroke_Style);
-                    rectPaint.setStrokeWidth(-1);
-                    rectPaint.setAntiAlias(true);
-                    canvas->drawRect(rect, rectPaint);
-        
-                    SkPaint labelPaint;
-                    labelPaint.setColor(color);
-                    labelPaint.setAntiAlias(true);
-                    labelPaint.setLCDRenderText(true);
-                    labelPaint.setTextSize(10 * SK_Scalar1);
-                    canvas->drawText(gStyles[style].fName,
-                                        strlen(gStyles[style].fName),
-                                        0, rect.height() + 12 * SK_Scalar1,
-                                        labelPaint);
-                    canvas->drawText(gFills[fill].fName,
-                                        strlen(gFills[fill].fName),
-                                        0, rect.height() + 24 * SK_Scalar1,
-                                        labelPaint);
-                    canvas->drawText(gCaps[cap].fName,
-                                        strlen(gCaps[cap].fName),
-                                        0, rect.height() + 36 * SK_Scalar1,
-                                        labelPaint);
-                }
-                canvas->restore();
-            }
-            canvas->restore();
-        }
-        canvas->restore();
-        canvas->restore();
-    }
-    
-private:
-    typedef GM INHERITED;
-};
-
-class MoveMovePathGM : public GM {
-public:
-    MoveMovePathGM() {}
-
-protected:
-    SkString onShortName() {
-        return SkString("movemovepath");
-    }
-        
-    SkISize onISize() { return make_isize(1240, 390); }
-    
-    void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
-                  const SkRect& clip,SkPaint::Cap cap,
-                  SkPaint::Style style, SkPath::FillType fill,
-                  SkScalar strokeWidth) {
-        path.setFillType(fill);
-        SkPaint paint;
-        paint.setStrokeCap(cap);
-        paint.setStrokeWidth(strokeWidth);
-        paint.setColor(color);
-        paint.setStyle(style);
-        canvas->save();
-        canvas->clipRect(clip);
-        canvas->drawPath(path, paint);
-        canvas->restore();
-    }
-    
-    virtual void onDraw(SkCanvas* canvas) {
-        struct FillAndName {
-            SkPath::FillType fFill;
-            const char*      fName;
-        };
-        static const FillAndName gFills[] = {
-            {SkPath::kWinding_FillType, "Winding"},
-            {SkPath::kEvenOdd_FillType, "Even / Odd"},
-            {SkPath::kInverseWinding_FillType, "Inverse Winding"},
-            {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
-        };
-        struct StyleAndName {
-            SkPaint::Style fStyle;
-            const char*    fName;
-        };
-        static const StyleAndName gStyles[] = {
-            {SkPaint::kFill_Style, "Fill"},
-            {SkPaint::kStroke_Style, "Stroke"},
-            {SkPaint::kStrokeAndFill_Style, "Stroke And Fill"},
-        };
-        struct CapAndName {
-            SkPaint::Cap fCap;
-            const char*  fName;
-        };
-        static const CapAndName gCaps[] = {
-            {SkPaint::kButt_Cap, "Butt"},
-            {SkPaint::kRound_Cap, "Round"},
-            {SkPaint::kSquare_Cap, "Square"},
-        };
-        struct PathAndName {
-            SkPath      fPath;
-            const char* fName;
-        };
-        PathAndName path;
-        path.fPath.moveTo(50*SK_Scalar1, 15*SK_Scalar1);
-        path.fPath.moveTo(75*SK_Scalar1, 15*SK_Scalar1);
-        path.fName = "moveTo-moveTo";
-
-        SkPaint titlePaint;
-        titlePaint.setColor(SK_ColorBLACK);
-        titlePaint.setAntiAlias(true);
-        titlePaint.setLCDRenderText(true);
-        titlePaint.setTextSize(15 * SK_Scalar1);
-        const char title[] = "Move Move Drawn Into Rectangle Clips With "
-                             "Indicated Style, Fill and Linecaps, with stroke width 10";
-        canvas->drawText(title, strlen(title),
-                            20 * SK_Scalar1,
-                            20 * SK_Scalar1,
-                            titlePaint);
-
-        SkRandom rand;
-        SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
-        canvas->save();
-        canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
-        canvas->save();
-        for (size_t cap = 0; cap < SK_ARRAY_COUNT(gCaps); ++cap) {
-            if (0 < cap) {
-                canvas->translate((rect.width() + 40 * SK_Scalar1) * SK_ARRAY_COUNT(gStyles), 0);
-            }
-            canvas->save();
-            for (size_t fill = 0; fill < SK_ARRAY_COUNT(gFills); ++fill) {
-                if (0 < fill) {
-                    canvas->translate(0, rect.height() + 40 * SK_Scalar1);
-                }
-                canvas->save();
-                for (size_t style = 0; style < SK_ARRAY_COUNT(gStyles); ++style) {
-                    if (0 < style) {
-                        canvas->translate(rect.width() + 40 * SK_Scalar1, 0);
-                    }
-        
-                    SkColor color = 0xff007000;
-                    this->drawPath(path.fPath, canvas, color, rect,
-                                    gCaps[cap].fCap, gStyles[style].fStyle,
-                                    gFills[fill].fFill, SK_Scalar1*10);
-        
-                    SkPaint rectPaint;
-                    rectPaint.setColor(SK_ColorBLACK);
-                    rectPaint.setStyle(SkPaint::kStroke_Style);
-                    rectPaint.setStrokeWidth(-1);
-                    rectPaint.setAntiAlias(true);
-                    canvas->drawRect(rect, rectPaint);
-        
-                    SkPaint labelPaint;
-                    labelPaint.setColor(color);
-                    labelPaint.setAntiAlias(true);
-                    labelPaint.setLCDRenderText(true);
-                    labelPaint.setTextSize(10 * SK_Scalar1);
-                    canvas->drawText(gStyles[style].fName,
-                                        strlen(gStyles[style].fName),
-                                        0, rect.height() + 12 * SK_Scalar1,
-                                        labelPaint);
-                    canvas->drawText(gFills[fill].fName,
-                                        strlen(gFills[fill].fName),
-                                        0, rect.height() + 24 * SK_Scalar1,
-                                        labelPaint);
-                    canvas->drawText(gCaps[cap].fName,
-                                        strlen(gCaps[cap].fName),
-                                        0, rect.height() + 36 * SK_Scalar1,
-                                        labelPaint);
-                }
-                canvas->restore();
-            }
-            canvas->restore();
-        }
-        canvas->restore();
-        canvas->restore();
-    }
-    
-private:
-    typedef GM INHERITED;
-};
-
-class MoveCloseMoveClosePathGM : public GM {
-public:
-    MoveCloseMoveClosePathGM() {}
-
-protected:
-    SkString onShortName() {
-        return SkString("moveclosemoveclosepath");
-    }
-        
-    SkISize onISize() { return make_isize(1240, 390); }
-    
-    void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
-                  const SkRect& clip,SkPaint::Cap cap,
-                  SkPaint::Style style, SkPath::FillType fill,
-                  SkScalar strokeWidth) {
-        path.setFillType(fill);
-        SkPaint paint;
-        paint.setStrokeCap(cap);
-        paint.setStrokeWidth(strokeWidth);
-        paint.setColor(color);
-        paint.setStyle(style);
-        canvas->save();
-        canvas->clipRect(clip);
-        canvas->drawPath(path, paint);
-        canvas->restore();
-    }
-    
-    virtual void onDraw(SkCanvas* canvas) {
-        struct FillAndName {
-            SkPath::FillType fFill;
-            const char*      fName;
-        };
-        static const FillAndName gFills[] = {
-            {SkPath::kWinding_FillType, "Winding"},
-            {SkPath::kEvenOdd_FillType, "Even / Odd"},
-            {SkPath::kInverseWinding_FillType, "Inverse Winding"},
-            {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
-        };
-        struct StyleAndName {
-            SkPaint::Style fStyle;
-            const char*    fName;
-        };
-        static const StyleAndName gStyles[] = {
-            {SkPaint::kFill_Style, "Fill"},
-            {SkPaint::kStroke_Style, "Stroke"},
-            {SkPaint::kStrokeAndFill_Style, "Stroke And Fill"},
-        };
-        struct CapAndName {
-            SkPaint::Cap fCap;
-            const char*  fName;
-        };
-        static const CapAndName gCaps[] = {
-            {SkPaint::kButt_Cap, "Butt"},
-            {SkPaint::kRound_Cap, "Round"},
-            {SkPaint::kSquare_Cap, "Square"},
-        };
-        struct PathAndName {
-            SkPath      fPath;
-            const char* fName;
-        };
-        PathAndName path;
-        path.fPath.moveTo(50*SK_Scalar1, 15*SK_Scalar1);
-        path.fPath.close();
-        path.fPath.moveTo(75*SK_Scalar1, 15*SK_Scalar1);
-        path.fPath.close();
-        path.fName = "moveTo-close-moveTo-close";
-
-        SkPaint titlePaint;
-        titlePaint.setColor(SK_ColorBLACK);
-        titlePaint.setAntiAlias(true);
-        titlePaint.setLCDRenderText(true);
-        titlePaint.setTextSize(15 * SK_Scalar1);
-        const char title[] = "Move-Close-Move-Close Drawn Into Rectangle Clips With "
-                             "Indicated Style, Fill and Linecaps, with stroke width 10";
-        canvas->drawText(title, strlen(title),
-                            20 * SK_Scalar1,
-                            20 * SK_Scalar1,
-                            titlePaint);
-
-        SkRandom rand;
-        SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
-        canvas->save();
-        canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
-        canvas->save();
-        for (size_t cap = 0; cap < SK_ARRAY_COUNT(gCaps); ++cap) {
-            if (0 < cap) {
-                canvas->translate((rect.width() + 40 * SK_Scalar1) * SK_ARRAY_COUNT(gStyles), 0);
-            }
-            canvas->save();
-            for (size_t fill = 0; fill < SK_ARRAY_COUNT(gFills); ++fill) {
-                if (0 < fill) {
-                    canvas->translate(0, rect.height() + 40 * SK_Scalar1);
-                }
-                canvas->save();
-                for (size_t style = 0; style < SK_ARRAY_COUNT(gStyles); ++style) {
-                    if (0 < style) {
-                        canvas->translate(rect.width() + 40 * SK_Scalar1, 0);
-                    }
-        
-                    SkColor color = 0xff007000;
-                    this->drawPath(path.fPath, canvas, color, rect,
-                                    gCaps[cap].fCap, gStyles[style].fStyle,
-                                    gFills[fill].fFill, SK_Scalar1*10);
-        
-                    SkPaint rectPaint;
-                    rectPaint.setColor(SK_ColorBLACK);
-                    rectPaint.setStyle(SkPaint::kStroke_Style);
-                    rectPaint.setStrokeWidth(-1);
-                    rectPaint.setAntiAlias(true);
-                    canvas->drawRect(rect, rectPaint);
-        
-                    SkPaint labelPaint;
-                    labelPaint.setColor(color);
-                    labelPaint.setAntiAlias(true);
-                    labelPaint.setLCDRenderText(true);
-                    labelPaint.setTextSize(10 * SK_Scalar1);
-                    canvas->drawText(gStyles[style].fName,
-                                        strlen(gStyles[style].fName),
-                                        0, rect.height() + 12 * SK_Scalar1,
-                                        labelPaint);
-                    canvas->drawText(gFills[fill].fName,
-                                        strlen(gFills[fill].fName),
-                                        0, rect.height() + 24 * SK_Scalar1,
-                                        labelPaint);
-                    canvas->drawText(gCaps[cap].fName,
-                                        strlen(gCaps[cap].fName),
-                                        0, rect.height() + 36 * SK_Scalar1,
-                                        labelPaint);
-                }
-                canvas->restore();
-            }
-            canvas->restore();
-        }
-        canvas->restore();
-        canvas->restore();
-    }
-    
-private:
-    typedef GM INHERITED;
-};
-
-//////////////////////////////////////////////////////////////////////////////
-
-static GM* MPathFactory(void*) { return new MovePathGM; }
-static GMRegistry regMPath(MPathFactory);
-
-static GM* MCPathFactory(void*) { return new MoveClosePathGM; }
-static GMRegistry regMCPath(MCPathFactory);
-
-static GM* MMPathFactory(void*) { return new MoveMovePathGM; }
-static GMRegistry regMMPath(MMPathFactory);
-
-static GM* MCMCPathFactory(void*) { return new MoveCloseMoveClosePathGM; }
-static GMRegistry regMCMCPath(MCMCPathFactory);
-
-}