move intensive computing/rendering from bench constructor to onPreDraw.

bench/RepeatTileBench.cpp

Index: bench/RepeatTileBench.cpp
===================================================================
--- bench/RepeatTileBench.cpp	(revision 10404)
+++ bench/RepeatTileBench.cpp	(working copy)
@@ -86,41 +86,50 @@
 class RepeatTileBench : public SkBenchmark {
     SkPaint     fPaint;
     SkString    fName;

[robertphillips, 2013/07/29 11:57:10]

line up all the member variable names

+    SkBitmap fBitmap;
+    SkBitmap::Config fConfig;

[robertphillips, 2013/07/29 11:57:10]

fIsOpaque

+    bool fOpaque;
     enum { N = SkBENCHLOOP(20) };
 public:
     RepeatTileBench(void* param, SkBitmap::Config c, bool isOpaque = false) : INHERITED(param) {
         const int w = 50;
         const int h = 50;
-        SkBitmap bm;
+        fConfig = c;
+        fOpaque = isOpaque;
 
-        if (SkBitmap::kIndex8_Config == c) {
-            bm.setConfig(SkBitmap::kARGB_8888_Config, w, h);
+        if (SkBitmap::kIndex8_Config == fConfig) {
+            fBitmap.setConfig(SkBitmap::kARGB_8888_Config, w, h);
         } else {
-            bm.setConfig(c, w, h);
+            fBitmap.setConfig(fConfig, w, h);
         }
-        bm.allocPixels();
-        bm.eraseColor(isOpaque ? SK_ColorWHITE : 0);
-        bm.setIsOpaque(isOpaque);
+        fName.printf("repeatTile_%s_%c",
+                     gConfigName[fBitmap.config()], isOpaque ? 'X' : 'A');
+    }
 
-        drawIntoBitmap(bm);
+protected:

[robertphillips, 2013/07/29 11:57:10]

SK_OVERRIDE

+    virtual const char* onGetName() {
+        return fName.c_str();
+    }
 

[robertphillips, 2013/07/29 11:57:10]

SK_OVERRIDE

-        if (SkBitmap::kIndex8_Config == c) {
+    virtual void onPreDraw() {
+        fBitmap.allocPixels();
+        fBitmap.eraseColor(fOpaque ? SK_ColorWHITE : 0);
+        fBitmap.setIsOpaque(fOpaque);
+

[robertphillips, 2013/07/29 11:57:10]

rename to draw_into_bitmap

+        drawIntoBitmap(fBitmap);
+
+        if (SkBitmap::kIndex8_Config == fConfig) {
             SkBitmap tmp;

[robertphillips, 2013/07/29 11:57:10]

rename to convert_to_index666

-            convertToIndex666(bm, &tmp);
-            bm = tmp;
+            convertToIndex666(fBitmap, &tmp);
+            fBitmap = tmp;
         }
 
-        SkShader* s = SkShader::CreateBitmapShader(bm,
+        SkShader* s = SkShader::CreateBitmapShader(fBitmap,
                                                    SkShader::kRepeat_TileMode,
                                                    SkShader::kRepeat_TileMode);
         fPaint.setShader(s)->unref();
-        fName.printf("repeatTile_%s_%c", gConfigName[bm.config()], isOpaque ? 'X' : 'A');
     }
 
-protected:
-    virtual const char* onGetName() {
-        return fName.c_str();
-    }
 

[robertphillips, 2013/07/29 11:57:10]

SK_OVERRIDE

     virtual void onDraw(SkCanvas* canvas) {
         SkPaint paint(fPaint);