commit f168b86d7fafc5c20c87bebc6fd393cb17e120ca
author tfarina <tfarina@chromium.org> Thu Jun 19 12:32:29 2014 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jun 19 12:32:29 2014 -0700
tree 9a1b1cff3725cc6cc030657fd83b5dca12137d86
parent 8e80d17d2b63fa84081236012f31bb10c58d344d

Remove Sk prefix from some bench classes.

This idea came while commenting on
https://codereview.chromium.org/343583005/

Since SkBenchmark, SkBenchLogger and SkGMBench are not part of the Skia library,
they should not have the Sk prefix.

BUG=None
TEST=make all
R=mtklein@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/347823004

dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index fde057d..2981013 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1,7 +1,8 @@
 // Main binary for DM.
 // For a high-level overview, please see dm/README.
 
-#include "SkBenchmark.h"
+#include "Benchmark.h"
+#include "CrashHandler.h"
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
@@ -9,7 +10,6 @@
 #include "SkString.h"
 #include "Test.h"
 #include "gm.h"
-#include "CrashHandler.h"
 
 #include "DMBenchTask.h"
 #include "DMCpuGMTask.h"
@@ -249,7 +249,7 @@
 
     SkTDArray<BenchRegistry::Factory> benches;
     if (FLAGS_benches) {
-        append_matching_factories<SkBenchmark>(BenchRegistry::Head(), &benches);
+        append_matching_factories<Benchmark>(BenchRegistry::Head(), &benches);
     }
 
     SkTDArray<TestRegistry::Factory> tests;

dm/DMBenchTask.cpp

diff --git a/dm/DMBenchTask.cpp b/dm/DMBenchTask.cpp
index 619bbc1..7cd2fdc 100644
--- a/dm/DMBenchTask.cpp
+++ b/dm/DMBenchTask.cpp
@@ -41,18 +41,18 @@
     , fSampleCount(sampleCount) {}
 
 bool NonRenderingBenchTask::shouldSkip() const {
-    return !fBench->isSuitableFor(SkBenchmark::kNonRendering_Backend);
+    return !fBench->isSuitableFor(Benchmark::kNonRendering_Backend);
 }
 
 bool CpuBenchTask::shouldSkip() const {
-    return !fBench->isSuitableFor(SkBenchmark::kRaster_Backend);
+    return !fBench->isSuitableFor(Benchmark::kRaster_Backend);
 }
 
 bool GpuBenchTask::shouldSkip() const {
-    return kGPUDisabled || !fBench->isSuitableFor(SkBenchmark::kGPU_Backend);
+    return kGPUDisabled || !fBench->isSuitableFor(Benchmark::kGPU_Backend);
 }
 
-static void draw_raster(SkBenchmark* bench, SkColorType colorType) {
+static void draw_raster(Benchmark* bench, SkColorType colorType) {
     SkBitmap bitmap;
     AllocatePixels(colorType, bench->getSize().x(), bench->getSize().y(), &bitmap);
     SkCanvas canvas(bitmap);

dm/DMBenchTask.h

diff --git a/dm/DMBenchTask.h b/dm/DMBenchTask.h
index ac7030b..3c71cd7 100644
--- a/dm/DMBenchTask.h
+++ b/dm/DMBenchTask.h
@@ -1,14 +1,14 @@
 #ifndef DMBenchTask_DEFINED
 #define DMBenchTask_DEFINED
 
+#include "Benchmark.h"
 #include "DMReporter.h"
 #include "DMTask.h"
 #include "DMTaskRunner.h"
-#include "SkBenchmark.h"
 #include "SkString.h"
 #include "SkTemplates.h"
 
-// Tasks that run an SkBenchmark once as a check that it doesn't crash.
+// Tasks that run an Benchmark once as a check that it doesn't crash.
 
 namespace DM {
 
@@ -21,7 +21,7 @@
     virtual SkString name() const SK_OVERRIDE { return fName; }
 
 private:
-    SkAutoTDelete<SkBenchmark> fBench;
+    SkAutoTDelete<Benchmark> fBench;
     const SkString fName;
 };
 
@@ -34,7 +34,7 @@
     virtual SkString name() const SK_OVERRIDE { return fName; }
 
 private:
-    SkAutoTDelete<SkBenchmark> fBench;
+    SkAutoTDelete<Benchmark> fBench;
     const SkString fName;
     const SkColorType fColorType;
 };
@@ -53,7 +53,7 @@
     virtual SkString name() const SK_OVERRIDE { return fName; }
 
 private:
-    SkAutoTDelete<SkBenchmark> fBench;
+    SkAutoTDelete<Benchmark> fBench;
     const SkString fName;
     const GrContextFactory::GLContextType fContextType;
     int fSampleCount;

dm/DMUtil.h

diff --git a/dm/DMUtil.h b/dm/DMUtil.h
index 8011e96..b99fe0c 100644
--- a/dm/DMUtil.h
+++ b/dm/DMUtil.h
@@ -1,7 +1,7 @@
 #ifndef DMUtil_DEFINED
 #define DMUtil_DEFINED
 
-#include "SkBenchmark.h"
+#include "Benchmark.h"
 #include "SkBitmap.h"
 #include "SkString.h"
 #include "gm_expectations.h"