Remove Sk prefix from some bench classes.

bench/DashBench.cpp

 
 /*
  * 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 "SkBenchmark.h"
+#include "Benchmark.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkDashPathEffect.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkRandom.h"
 #include "SkString.h"
 #include "SkTDArray.h"
 
 
 /*
  *  Cases to consider:
  *
  *  1. antialiasing on/off (esp. width <= 1)
  *  2. strokewidth == 0, 1, 2
  *  3. hline, vline, diagonal, rect, oval
  *  4. dots [1,1] ([N,N] where N=strokeWidth?) or arbitrary (e.g. [2,1] or [1,2,3,2])
  */
 static void path_hline(SkPath* path) {
     path->moveTo(SkIntToScalar(10), SkIntToScalar(10));
     path->lineTo(SkIntToScalar(600), SkIntToScalar(10));
 }
 
-class DashBench : public SkBenchmark {
+class DashBench : public Benchmark {
 protected:
     SkString            fName;
     SkTDArray<SkScalar> fIntervals;
     int                 fWidth;
     SkPoint             fPts[2];
     bool                fDoClip;
 
 public:
     DashBench(const SkScalar intervals[], int count, int width,
               bool doClip = false)  {
@@ skipping 44 matching lines @@
 
     virtual void handlePath(SkCanvas* canvas, const SkPath& path,
                             const SkPaint& paint, int N) {
         for (int i = 0; i < N; ++i) {
 //            canvas->drawPoints(SkCanvas::kLines_PointMode, 2, fPts, paint);
             canvas->drawPath(path, paint);
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 class RectDashBench : public DashBench {
 public:
     RectDashBench(const SkScalar intervals[], int count, int width)
     : INHERITED(intervals, count, width) {
         fName.append("_rect");
     }
 
 protected:
@@ skipping 60 matching lines @@
 
 static void make_cubic(SkPath* path) {
     SkScalar x0 = SkIntToScalar(10);
     SkScalar y0 = SkIntToScalar(10);
     path->moveTo(x0, y0);
     path->cubicTo(x0,                    y0 + 400 * SK_Scalar1,
                   x0 + 600 * SK_Scalar1, y0 + 400 * SK_Scalar1,
                   x0 + 600 * SK_Scalar1, y0);
 }
 
-class MakeDashBench : public SkBenchmark {
+class MakeDashBench : public Benchmark {
     SkString fName;
     SkPath   fPath;
     SkAutoTUnref<SkPathEffect> fPE;
 
 public:
     MakeDashBench(void (*proc)(SkPath*), const char name[])  {
         fName.printf("makedash_%s", name);
         proc(&fPath);
 
         SkScalar vals[] = { SkIntToScalar(4), SkIntToScalar(4) };
         fPE.reset(SkDashPathEffect::Create(vals, 2, 0));
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
     virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         SkPath dst;
         for (int i = 0; i < loops; ++i) {
             SkStrokeRec rec(SkStrokeRec::kHairline_InitStyle);
 
             fPE->filterPath(&dst, fPath, &rec, NULL);
             dst.rewind();
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 /*
  *  We try to special case square dashes (intervals are equal to strokewidth).
  */
-class DashLineBench : public SkBenchmark {
+class DashLineBench : public Benchmark {
     SkString fName;
     SkScalar fStrokeWidth;
     bool     fIsRound;
     SkAutoTUnref<SkPathEffect> fPE;
 
 public:
     DashLineBench(SkScalar width, bool isRound)  {
         fName.printf("dashline_%g_%s", SkScalarToFloat(width), isRound ? "circle" : "square");
         fStrokeWidth = width;
         fIsRound = isRound;
@@ skipping 13 matching lines @@
         paint.setStrokeWidth(fStrokeWidth);
         paint.setStrokeCap(fIsRound ? SkPaint::kRound_Cap : SkPaint::kSquare_Cap);
         paint.setPathEffect(fPE);
         for (int i = 0; i < loops; ++i) {
             canvas->drawLine(10 * SK_Scalar1, 10 * SK_Scalar1,
                              640 * SK_Scalar1, 10 * SK_Scalar1, paint);
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
-class DrawPointsDashingBench : public SkBenchmark {
+class DrawPointsDashingBench : public Benchmark {
     SkString fName;
     int      fStrokeWidth;
     bool     fDoAA;
 
     SkAutoTUnref<SkPathEffect> fPathEffect;
 
 public:
     DrawPointsDashingBench(int dashLength, int strokeWidth, bool doAA)
          {
         fName.printf("drawpointsdash_%d_%d%s", dashLength, strokeWidth, doAA ? "_aa" : "_bw");
@@ skipping 23 matching lines @@
             { SkIntToScalar(640), 0 }
         };
 
         for (int i = 0; i < loops; ++i) {
             pts[0].fY = pts[1].fY = SkIntToScalar(i % 480);
             canvas->drawPoints(SkCanvas::kLines_PointMode, 2, pts, p);
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 // Want to test how we handle dashing when 99% of the dash is clipped out
-class GiantDashBench : public SkBenchmark {
+class GiantDashBench : public Benchmark {
     SkString fName;
     SkScalar fStrokeWidth;
     SkPoint  fPts[2];
     SkAutoTUnref<SkPathEffect> fPathEffect;
 
 public:
     enum LineType {
         kHori_LineType,
         kVert_LineType,
         kDiag_LineType,
@@ skipping 53 matching lines @@
         p.setStyle(SkPaint::kStroke_Style);
         p.setStrokeWidth(fStrokeWidth);
         p.setPathEffect(fPathEffect);
 
         for (int i = 0; i < loops; i++) {
             canvas->drawPoints(SkCanvas::kLines_PointMode, 2, fPts, p);
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 // Want to test how we draw a dashed grid (like what is used in spreadsheets) of many
 // small dashed lines switching back and forth between horizontal and vertical
-class DashGridBench : public SkBenchmark {
+class DashGridBench : public Benchmark {
     SkString fName;
     int      fStrokeWidth;
     bool     fDoAA;
 
     SkAutoTUnref<SkPathEffect> fPathEffect;
 
 public:
     DashGridBench(int dashLength, int strokeWidth, bool doAA) {
         fName.printf("dashgrid_%d_%d%s", dashLength, strokeWidth, doAA ? "_aa" : "_bw");
         fStrokeWidth = strokeWidth;
@@ skipping 41 matching lines @@
                     vertPts[0].fY = pts[2].fY + j * 22.f;
                     vertPts[1].fX = pts[3].fX + k * 22.f;
                     vertPts[1].fY = pts[3].fY + j * 22.f;
                     canvas->drawPoints(SkCanvas::kLines_PointMode, 2, vertPts, p);
                 }
             }
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static const SkScalar gDots[] = { SK_Scalar1, SK_Scalar1 };
 
 #define PARAM(array)    array, SK_ARRAY_COUNT(array)
 
 DEF_BENCH( return new DashBench(PARAM(gDots), 0); )
 DEF_BENCH( return new DashBench(PARAM(gDots), 1); )
@@ skipping 29 matching lines @@
 // hori_2 is just too slow to enable at the moment
 DEF_BENCH( return new GiantDashBench(GiantDashBench::kHori_LineType, 2); )
 DEF_BENCH( return new GiantDashBench(GiantDashBench::kVert_LineType, 2); )
 DEF_BENCH( return new GiantDashBench(GiantDashBench::kDiag_LineType, 2); )
 
 DEF_BENCH( return new DashGridBench(1, 1, true); )
 DEF_BENCH( return new DashGridBench(1, 1, false); )
 DEF_BENCH( return new DashGridBench(3, 1, true); )
 DEF_BENCH( return new DashGridBench(3, 1, false); )
 #endif