Remove Sk prefix from some bench classes.

bench/RectBench.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 "SkCanvas.h"
 #include "SkCommandLineFlags.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
 
 DEFINE_double(strokeWidth, -1.0, "If set, use this stroke width in RectBench.");
 
-class RectBench : public SkBenchmark {
+class RectBench : public Benchmark {
 public:
     int fShift, fStroke;
     enum {
         W = 640,
         H = 480,
         N = 300,
     };
     SkRect  fRects[N];
     SkColor fColors[N];
 
@@ skipping 42 matching lines @@
             paint.setStyle(SkPaint::kStroke_Style);
             paint.setStrokeWidth(SkIntToScalar(fStroke));
         }
         for (int i = 0; i < loops; i++) {
             paint.setColor(fColors[i % N]);
             this->setupPaint(&paint);
             this->drawThisRect(canvas, fRects[i % N], paint);
         }
     }
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 class SrcModeRectBench : public RectBench {
 public:
     SrcModeRectBench() : INHERITED(1, 0) {
         fMode = SkXfermode::Create(SkXfermode::kSrc_Mode);
     }
 
     virtual ~SrcModeRectBench() {
         SkSafeUnref(fMode);
@@ skipping 71 matching lines @@
                 paint.setStrokeWidth(gSizes[i]);
                 this->setupPaint(&paint);
                 canvas->drawPoints(fMode, N * 2, SkTCast<SkPoint*>(fRects), paint);
                 paint.setColor(fColors[i % N]);
             }
         }
     }
     virtual const char* onGetName() { return fName; }
 };
 
-class AARectBench : public SkBenchmark {
+class AARectBench : public Benchmark {
 public:
     enum {
         W = 640,
         H = 480,
     };
 
     AARectBench(bool rotate) : fRotate(rotate) {}
 
 protected:
 
@@ skipping 30 matching lines @@
 
                     canvas->drawRect(r, paint);
                     canvas->restore();
                 }
             }
         }
 
     }
 private:
     bool fRotate;
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 /*******************************************************************************
  * to bench BlitMask [Opaque, Black, color, shader]
  *******************************************************************************/
 
 class BlitMaskBench : public RectBench {
 public:
     enum kMaskType {
         kMaskOpaque = 0,
@@ skipping 101 matching lines @@
                       BlitMaskBench::kMaskBlack, "maskblack")
                       ); )
 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench,
                       (SkCanvas::kPoints_PointMode,
                       BlitMaskBench::kMaskColor, "maskcolor")
                       ); )
 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench,
                      (SkCanvas::kPoints_PointMode,
                      BlitMaskBench::KMaskShader, "maskshader")
                      ); )