Major bench refactoring.

bench/MatrixBench.cpp

Index: bench/MatrixBench.cpp
diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp
index cae56224142540122b2f667422782831642e760a..128a49e9b3509a9745117f3a5bb2e8ca5069c37d 100644
--- a/bench/MatrixBench.cpp
+++ b/bench/MatrixBench.cpp
@@ -12,7 +12,6 @@
 
 class MatrixBench : public SkBenchmark {
     SkString    fName;
-    enum { N = 100000 };
 public:
     MatrixBench(void* param, const char name[]) : INHERITED(param) {
         fName.printf("matrix_%s", name);
@@ -29,8 +28,7 @@ protected:
     }
 
     virtual void onDraw(SkCanvas*) {
-        int n = SkBENCHLOOP(N * this->mulLoopCount());
-        for (int i = 0; i < n; i++) {
+        for (int i = 0; i < this->getLoops(); i++) {
             this->performTest();
         }
     }
@@ -296,11 +294,11 @@ class ScaleTransMixedMatrixBench : public MatrixBench {
     }
  private:
     enum {
-        kCount = SkBENCHLOOP(16)
+        kCount = 16
     };
     SkMatrix fMatrix;
-    SkPoint fSrc [16];
-    SkPoint fDst [16];
+    SkPoint fSrc [kCount];
+    SkPoint fDst [kCount];
     SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };
@@ -336,11 +334,11 @@ class ScaleTransDoubleMatrixBench : public MatrixBench {
     }
  private:
     enum {
-        kCount = SkBENCHLOOP(16)
+        kCount = 16
     };
     double fMatrix [9];
-    SkPoint fSrc [16];
-    SkPoint fDst [16];
+    SkPoint fSrc [kCount];
+    SkPoint fDst [kCount];
     SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };