Remove Sk prefix from some bench classes.

bench/GradientBench.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 "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkGradientShader.h"
 #include "SkPaint.h"
 #include "SkShader.h"
 #include "SkString.h"
 
 struct GradData {
     int             fCount;
@@ skipping 171 matching lines @@
         case kOval_GeomType:
             return "oval";
         default:
             SkDEBUGFAIL("unknown geometry type");
             return "error";
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class GradientBench : public SkBenchmark {
+class GradientBench : public Benchmark {
     SkString fName;
     SkShader* fShader;
     enum {
         W   = 400,
         H   = 400,
         kRepeat = 15,
     };
 public:
     GradientBench(GradType gradType,
                   GradData data = gGradData[0],
@@ skipping 44 matching lines @@
                    canvas->drawRect(r, paint);
                    break;
                case kOval_GeomType:
                    canvas->drawOval(r, paint);
                    break;
             }
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 
     GeomType fGeomType;
 };
 
 DEF_BENCH( return new GradientBench(kLinear_GradType); )
 DEF_BENCH( return new GradientBench(kLinear_GradType, gGradData[1]); )
 DEF_BENCH( return new GradientBench(kLinear_GradType, gGradData[2]); )
 DEF_BENCH( return new GradientBench(kLinear_GradType, gGradData[0], SkShader::kMirror_TileMode); )
 
 DEF_BENCH( return new GradientBench(kRadial_GradType, gGradData[0]); )
@@ skipping 23 matching lines @@
 DEF_BENCH( return new GradientBench(kConicalZero_GradType, gGradData[2]); )
 DEF_BENCH( return new GradientBench(kConicalOut_GradType); )
 DEF_BENCH( return new GradientBench(kConicalOut_GradType, gGradData[1]); )
 DEF_BENCH( return new GradientBench(kConicalOut_GradType, gGradData[2]); )
 DEF_BENCH( return new GradientBench(kConicalOutZero_GradType); )
 DEF_BENCH( return new GradientBench(kConicalOutZero_GradType, gGradData[1]); )
 DEF_BENCH( return new GradientBench(kConicalOutZero_GradType, gGradData[2]); )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class Gradient2Bench : public SkBenchmark {
+class Gradient2Bench : public Benchmark {
     SkString fName;
     bool     fHasAlpha;
 
 public:
     Gradient2Bench(bool hasAlpha)  {
         fName.printf("gradient_create_%s", hasAlpha ? "alpha" : "opaque");
         fHasAlpha = hasAlpha;
     }
 
 protected:
@@ skipping 20 matching lines @@
                 SK_ColorWHITE };
             SkShader* s = SkGradientShader::CreateLinear(pts, colors, NULL,
                                                          SK_ARRAY_COUNT(colors),
                                                          SkShader::kClamp_TileMode);
             paint.setShader(s)->unref();
             canvas->drawRect(r, paint);
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 DEF_BENCH( return new Gradient2Bench(false); )
 DEF_BENCH( return new Gradient2Bench(true); )