Remove Sk prefix from some bench classes.

bench/RegionBench.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 "SkRandom.h"
 #include "SkRegion.h"
 #include "SkString.h"
 
 static bool union_proc(SkRegion& a, SkRegion& b) {
     SkRegion result;
     return result.op(a, b, SkRegion::kUnion_Op);
 }
 
 static bool sect_proc(SkRegion& a, SkRegion& b) {
@@ skipping 41 matching lines @@
     const int dx = r.width() / 8;
     const int dy = r.height() / 8;
     for (int y = r.fTop; y < r.fBottom; y += dy) {
         for (int x = r.fLeft; x < r.fRight; x += dx) {
             (void)a.contains(x, y);
         }
     }
     return true;
 }
 
-class RegionBench : public SkBenchmark {
+class RegionBench : public Benchmark {
 public:
     typedef bool (*Proc)(SkRegion& a, SkRegion& b);
 
     SkRegion fA, fB;
     Proc     fProc;
     SkString fName;
 
     enum {
         W = 1024,
         H = 768,
@@ skipping 26 matching lines @@
     virtual const char* onGetName() { return fName.c_str(); }
 
     virtual void onDraw(const int loops, SkCanvas* canvas) {
         Proc proc = fProc;
         for (int i = 0; i < loops; ++i) {
             proc(fA, fB);
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
-class RectSectBench : public SkBenchmark {
+class RectSectBench : public Benchmark {
     enum {
         N = 1000
     };
     SkRect fArray0[N];
     SkRect fArray1[N];
     SkString fName;
     bool fNewWay;
 
 public:
     static void RandRect(SkRect* r, SkRandom& rand) {
@@ skipping 29 matching lines @@
             } else {
                 for (int j = 0; j < N; ++j) {
                     SkRect r = fArray0[j];
                     r.intersect(fArray1[j]);
                 }
             }
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #define SMALL   16
 
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, union_proc, "union")); )
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, sect_proc, "intersect")); )
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, diff_proc, "difference")); )
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, diffrect_proc, "differencerect")); )
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, diffrectbig_proc, "differencerectbig")); )
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, containsrect_proc, "containsrect")); )
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, sectsrgn_proc, "intersectsrgn")); )
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, sectsrect_proc, "intersectsrect")); )
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, containsxy_proc, "containsxy")); )
 
 DEF_BENCH( return SkNEW_ARGS(RectSectBench, (false)); )
 DEF_BENCH( return SkNEW_ARGS(RectSectBench, (true)); )