Remove Sk prefix from some bench classes.

bench/ScalarBench.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 "SkFloatBits.h"
 #include "SkRandom.h"
 #include "SkRect.h"
 #include "SkString.h"
 
-class ScalarBench : public SkBenchmark {
+class ScalarBench : public Benchmark {
     SkString    fName;
 public:
     ScalarBench(const char name[])  {
         fName.printf("scalar_%s", name);
     }
 
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
     }
 
     virtual void performTest() = 0;
 
 protected:
     virtual int mulLoopCount() const { return 1; }
 
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
     virtual void onDraw(const int loops, SkCanvas* canvas) {
         for (int i = 0; i < loops; i++) {
             this->performTest();
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 // having unknown values in our arrays can throw off the timing a lot, perhaps
 // handling NaN values is a lot slower. Anyway, this guy is just meant to put
 // reasonable values in our arrays.
 template <typename T> void init9(T array[9]) {
     SkRandom rand;
     for (int i = 0; i < 9; i++) {
         array[i] = rand.nextSScalar1();
     }
@@ skipping 66 matching lines @@
     enum {
         ARRAY_N = 64
     };
     SkScalar fArray[ARRAY_N];
 
     typedef ScalarBench INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class RectBoundsBench : public SkBenchmark {
+class RectBoundsBench : public Benchmark {
     enum {
         PTS = 100,
     };
     SkPoint fPts[PTS];
 
 public:
     RectBoundsBench() {
         SkRandom rand;
         for (int i = 0; i < PTS; ++i) {
             fPts[i].fX = rand.nextSScalar1();
@@ skipping 11 matching lines @@
     }
 
     virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkRect r;
         for (int i = 0; i < loops; ++i) {
             r.set(fPts, PTS);
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new FloatComparisonBench(); )
 DEF_BENCH( return new ForcedIntComparisonBench(); )
 DEF_BENCH( return new RectBoundsBench(); )
 DEF_BENCH( return new IsFiniteScalarBench(); )