Remove Sk prefix from some bench classes.

bench/BitmapRectBench.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 "SkPaint.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
+#include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkString.h"
 
 static void draw_into_bitmap(const SkBitmap& bm) {
     const int w = bm.width();
     const int h = bm.height();
 
     SkCanvas canvas(bm);
     SkPaint p;
     p.setAntiAlias(true);
     p.setColor(SK_ColorRED);
     canvas.drawCircle(SkIntToScalar(w)/2, SkIntToScalar(h)/2,
                       SkIntToScalar(SkMin32(w, h))*3/8, p);
 
     SkRect r;
     r.set(0, 0, SkIntToScalar(w), SkIntToScalar(h));
     p.setStyle(SkPaint::kStroke_Style);
     p.setStrokeWidth(SkIntToScalar(4));
     p.setColor(SK_ColorBLUE);
     canvas.drawRect(r, p);
 }
 
 /*  Variants for bitmaprect
     src : entire bitmap, subset, fractional subset
     dst : same size as src, diff size
     paint : filter-p
  */
 
-class BitmapRectBench : public SkBenchmark {
+class BitmapRectBench : public Benchmark {
     SkBitmap                fBitmap;
     bool                    fSlightMatrix;
     uint8_t                 fAlpha;
     SkPaint::FilterLevel    fFilterLevel;
     SkString                fName;
     SkRect                  fSrcR, fDstR;
 
     static const int kWidth = 128;
     static const int kHeight = 128;
 public:
@@ skipping 42 matching lines @@
         this->setupPaint(&paint);
         paint.setFilterLevel(fFilterLevel);
         paint.setAlpha(fAlpha);
 
         for (int i = 0; i < loops; i++) {
             canvas->drawBitmapRectToRect(fBitmap, &fSrcR, fDstR, &paint);
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kNone_FilterLevel, false))
 DEF_BENCH(return new BitmapRectBench(0x80, SkPaint::kNone_FilterLevel, false))
 DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kLow_FilterLevel, false))
 DEF_BENCH(return new BitmapRectBench(0x80, SkPaint::kLow_FilterLevel, false))
 
 DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kNone_FilterLevel, true))
 DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kLow_FilterLevel, true))