Major bench refactoring.

bench/XfermodeBench.cpp

 
 /*
  * Copyright 2013 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 "SkCanvas.h"
@@ skipping 18 matching lines @@
         fXfermode.reset(xferMode);
         fName.printf("Xfermode_%s", name);
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkISize size = canvas->getDeviceSize();
         SkMWCRandom random;
-        for (int i = 0; i < kNumRects; ++i) {
+        for (int i = 0; i < this->getLoops(); ++i) {
             SkPaint paint;
             paint.setXfermode(fXfermode.get());
             paint.setColor(random.nextU());
             SkScalar w = random.nextRangeScalar(SkIntToScalar(kMinSize), SkIntToScalar(kMaxSize));
             SkScalar h = random.nextRangeScalar(SkIntToScalar(kMinSize), SkIntToScalar(kMaxSize));
             SkRect rect = SkRect::MakeXYWH(
                 random.nextUScalar1() * (size.fWidth - w),
                 random.nextUScalar1() * (size.fHeight - h),
                 w,
                 h
             );
             canvas->drawRect(rect, paint);
         }
     }
 
 private:
     enum {
-        kNumRects = SkBENCHLOOP(75),
         kMinSize = 50,
         kMaxSize = 100,
     };
     SkAutoTUnref<SkXfermode> fXfermode;
     SkString fName;
 
     typedef SkBenchmark INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ skipping 32 matching lines @@
 BENCH(SkXfermode::kExclusion_Mode)
 BENCH(SkXfermode::kMultiply_Mode)
 
 BENCH(SkXfermode::kHue_Mode)
 BENCH(SkXfermode::kSaturation_Mode)
 BENCH(SkXfermode::kColor_Mode)
 BENCH(SkXfermode::kLuminosity_Mode)
 
 BENCH(SkLumaMaskXfermode::Create(SkXfermode::kSrcIn_Mode), "SrcInLuma")
 BENCH(SkLumaMaskXfermode::Create(SkXfermode::kDstIn_Mode), "DstInLuma")