Remove Sk prefix from some bench classes.

bench/AAClipBench.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 "SkAAClip.h"
+#include "SkCanvas.h"
 #include "SkPath.h"
+#include "SkRandom.h"
 #include "SkRegion.h"
 #include "SkString.h"
-#include "SkCanvas.h"
-#include "SkRandom.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // This bench tests out AA/BW clipping via canvas' clipPath and clipRect calls
-class AAClipBench : public SkBenchmark {
+class AAClipBench : public Benchmark {
     SkString fName;
     SkPath   fClipPath;
     SkRect   fClipRect;
     SkRect   fDrawRect;
     bool     fDoPath;
     bool     fDoAA;
 
 public:
     AAClipBench(bool doPath, bool doAA)
         : fDoPath(doPath)
@@ skipping 43 matching lines @@
             if (fDoPath) {
                 canvas->drawPath(fClipPath, paint);
             } else {
                 canvas->drawRect(fClipRect, paint);
             }
 #endif
             canvas->restore();
         }
     }
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // This bench tests out nested clip stacks. It is intended to simulate
 // how WebKit nests clips.
-class NestedAAClipBench : public SkBenchmark {
+class NestedAAClipBench : public Benchmark {
     SkString fName;
     bool     fDoAA;
     SkRect   fDrawRect;
     SkRandom fRandom;
 
     static const int kNestingDepth = 3;
     static const int kImageSize = 400;
 
     SkPoint fSizes[kNestingDepth+1];
 
@@ skipping 61 matching lines @@
 
     virtual void onDraw(const int loops, SkCanvas* canvas) {
 
         for (int i = 0; i < loops; ++i) {
             SkPoint offset = SkPoint::Make(0, 0);
             this->recurse(canvas, 0, offset);
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
-class AAClipBuilderBench : public SkBenchmark {
+class AAClipBuilderBench : public Benchmark {
     SkString fName;
     SkPath   fPath;
     SkRect   fRect;
     SkRegion fRegion;
     bool     fDoPath;
     bool     fDoAA;
 
 public:
     AAClipBuilderBench(bool doPath, bool doAA)  {
         fDoPath = doPath;
@@ skipping 17 matching lines @@
         for (int i = 0; i < loops; ++i) {
             SkAAClip clip;
             if (fDoPath) {
                 clip.setPath(fPath, &fRegion, fDoAA);
             } else {
                 clip.setRect(fRect, fDoAA);
             }
         }
     }
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
-class AAClipRegionBench : public SkBenchmark {
+class AAClipRegionBench : public Benchmark {
 public:
     AAClipRegionBench()  {
         SkPath path;
         // test conversion of a complex clip to a aaclip
         path.addCircle(0, 0, SkIntToScalar(200));
         path.addCircle(0, 0, SkIntToScalar(180));
         // evenodd means we've constructed basically a stroked circle
         path.setFillType(SkPath::kEvenOdd_FillType);
 
         SkIRect bounds;
         path.getBounds().roundOut(&bounds);
         fRegion.setPath(path, SkRegion(bounds));
     }
 
 protected:
     virtual const char* onGetName() { return "aaclip_setregion"; }
     virtual void onDraw(const int loops, SkCanvas*) {
         for (int i = 0; i < loops; ++i) {
             SkAAClip clip;
             clip.setRegion(fRegion);
         }
     }
 
 private:
     SkRegion fRegion;
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return SkNEW_ARGS(AAClipBuilderBench, (false, false)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBuilderBench, (false, true)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBuilderBench, (true, false)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBuilderBench, (true, true)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipRegionBench, ()); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBench, (false, false)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBench, (false, true)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBench, (true, false)); )
 DEF_BENCH( return SkNEW_ARGS(AAClipBench, (true, true)); )
 DEF_BENCH( return SkNEW_ARGS(NestedAAClipBench, (false)); )
 DEF_BENCH( return SkNEW_ARGS(NestedAAClipBench, (true)); )