Move non-trivial work in RectBench to onPreDraw.

bench/RectBench.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 "SkCanvas.h"
 #include "SkCommandLineFlags.h"
@@ skipping 10 matching lines @@
     enum {
         W = 640,
         H = 480,
         N = 300,
     };
     SkRect  fRects[N];
     SkColor fColors[N];
 
     RectBench(int shift, int stroke = 0)
         : fShift(shift)
-        , fStroke(stroke) {
-        SkRandom rand;
-        const SkScalar offset = SK_Scalar1/3;
-        for (int i = 0; i < N; i++) {
-            int x = rand.nextU() % W;
-            int y = rand.nextU() % H;
-            int w = rand.nextU() % W;
-            int h = rand.nextU() % H;
-            w >>= shift;
-            h >>= shift;
-            x -= w/2;
-            y -= h/2;
-            fRects[i].set(SkIntToScalar(x), SkIntToScalar(y),
-                          SkIntToScalar(x+w), SkIntToScalar(y+h));
-            fRects[i].offset(offset, offset);
-            fColors[i] = rand.nextU() | 0xFF808080;
-        }
-    }
+        , fStroke(stroke) {}
 
     SkString fName;
     const char* computeName(const char root[]) {
         fName.printf("%s_%d", root, fShift);
         if (fStroke > 0) {
             fName.appendf("_stroke_%d", fStroke);
         }
         return fName.c_str();
     }
 
 protected:
     virtual void drawThisRect(SkCanvas* c, const SkRect& r, const SkPaint& p) {
         c->drawRect(r, p);
     }
 
     virtual const char* onGetName() { return computeName("rects"); }
+
+    virtual void onPreDraw() {
+        SkRandom rand;
+        const SkScalar offset = SK_Scalar1/3;
+        for (int i = 0; i < N; i++) {
+            int x = rand.nextU() % W;
+            int y = rand.nextU() % H;
+            int w = rand.nextU() % W;
+            int h = rand.nextU() % H;
+            w >>= fShift;
+            h >>= fShift;
+            x -= w/2;
+            y -= h/2;
+            fRects[i].set(SkIntToScalar(x), SkIntToScalar(y),
+                          SkIntToScalar(x+w), SkIntToScalar(y+h));
+            fRects[i].offset(offset, offset);
+            fColors[i] = rand.nextU() | 0xFF808080;
+        }
+    }
+
     virtual void onDraw(const int loops, SkCanvas* canvas) {
         SkPaint paint;
         if (fStroke > 0) {
             paint.setStyle(SkPaint::kStroke_Style);
             paint.setStrokeWidth(SkIntToScalar(fStroke));
         }
         for (int i = 0; i < loops; i++) {
             paint.setColor(fColors[i % N]);
             this->setupPaint(&paint);
             this->drawThisRect(canvas, fRects[i % N], paint);
@@ skipping 259 matching lines @@
                       BlitMaskBench::kMaskBlack, "maskblack")
                       ); )
 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench,
                       (SkCanvas::kPoints_PointMode,
                       BlitMaskBench::kMaskColor, "maskcolor")
                       ); )
 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench,
                      (SkCanvas::kPoints_PointMode,
                      BlitMaskBench::KMaskShader, "maskshader")
                      ); )