Remove Sk prefix from some bench classes.

bench/BlurBench.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 "SkBlurMask.h"
+#include "SkBlurMaskFilter.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
-#include "SkBlurMaskFilter.h"
 
 #define SMALL   SkIntToScalar(2)
 #define REAL    1.5f
 #define BIG     SkIntToScalar(10)
 #define REALBIG 100.5f
 
 static const char* gStyleName[] = {
     "normal",
     "solid",
     "outer",
     "inner"
 };
 
-class BlurBench : public SkBenchmark {
+class BlurBench : public Benchmark {
     SkScalar    fRadius;
     SkBlurStyle fStyle;
     uint32_t    fFlags;
     SkString    fName;
 
 public:
     BlurBench(SkScalar rad, SkBlurStyle bs, uint32_t flags = 0) {
         fRadius = rad;
         fStyle = bs;
         fFlags = flags;
@@ skipping 28 matching lines @@
                 SkMaskFilter* mf = SkBlurMaskFilter::Create(fStyle,
                                             SkBlurMask::ConvertRadiusToSigma(fRadius),
                                             fFlags);
                 paint.setMaskFilter(mf)->unref();
             }
             canvas->drawOval(r, paint);
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 DEF_BENCH(return new BlurBench(SMALL, kNormal_SkBlurStyle);)
 DEF_BENCH(return new BlurBench(SMALL, kSolid_SkBlurStyle);)
 DEF_BENCH(return new BlurBench(SMALL, kOuter_SkBlurStyle);)
 DEF_BENCH(return new BlurBench(SMALL, kInner_SkBlurStyle);)
 
 DEF_BENCH(return new BlurBench(BIG, kNormal_SkBlurStyle);)
 DEF_BENCH(return new BlurBench(BIG, kSolid_SkBlurStyle);)
 DEF_BENCH(return new BlurBench(BIG, kOuter_SkBlurStyle);)
@@ skipping 11 matching lines @@
 
 DEF_BENCH(return new BlurBench(SMALL, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);)
 
 DEF_BENCH(return new BlurBench(BIG, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);)
 
 DEF_BENCH(return new BlurBench(REALBIG, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);)
 
 DEF_BENCH(return new BlurBench(REAL, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);)
 
 DEF_BENCH(return new BlurBench(0, kNormal_SkBlurStyle);)