switch to a new canvas every once in a while in picture_record_unique

bench/PictureRecordBench.cpp

 /*
  * Copyright 2012 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 "SkColor.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPoint.h"
 #include "SkRandom.h"
 #include "SkRect.h"
 #include "SkString.h"
 
 class PictureRecordBench : public SkBenchmark {
 public:
     PictureRecordBench(const char name[])  {
         fName.printf("picture_record_%s", name);
-        fPictureWidth = SkIntToScalar(PICTURE_WIDTH);
-        fPictureHeight = SkIntToScalar(PICTURE_HEIGHT);
         fIsRendering = false;
     }
 
     enum {
         PICTURE_WIDTH = 1000,
         PICTURE_HEIGHT = 4000,
     };
 protected:
     virtual const char* onGetName() {
         return fName.c_str();
     }
 
     virtual void onDraw(SkCanvas*) {

[robertphillips, 2013/09/17 16:19:33]

Don't think we need most of this stuff anymore. Can we just move 'recordCanvas'
here?

[mtklein, 2013/09/17 16:55:10]

Sorry, I'm a little lost.  Do you mean, have UniquePaintDictionaryRecordBench
inherit directly from SkBenchmark?

         SkPicture picture;
 
         SkCanvas* pCanvas = picture.beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT);
         recordCanvas(pCanvas);
 
         // we don't need to draw the picture as the endRecording step will
         // do the work of transferring the recorded content into a playback
         // object.
         picture.endRecording();
     }
 
     virtual void recordCanvas(SkCanvas* canvas) = 0;
 
     SkString fName;
-    SkScalar fPictureWidth;
-    SkScalar fPictureHeight;
-    SkScalar fTextSize;
 private:
     typedef SkBenchmark INHERITED;
 };
 
 /*
  *  An SkPicture has internal dictionaries to store bitmaps, matrices, paints,
  *  and regions.  This bench populates those dictionaries to test the speed of
  *  reading and writing to those particular dictionary data structures.
  */
 class DictionaryRecordBench : public PictureRecordBench {
@@ skipping 57 matching lines @@
 /*
  *  Populates the SkPaint dictionary with a large number of unique paint
  *  objects that differ only by color
  */
 class UniquePaintDictionaryRecordBench : public PictureRecordBench {
 public:
     UniquePaintDictionaryRecordBench()
         : INHERITED("unique_paint_dictionary") { }
 
 protected:
-    virtual void recordCanvas(SkCanvas* canvas) {
+    virtual void recordCanvas(SkCanvas* /*ignored*/) {
+        // We ignore the parent's canvas (which is just there for our
+        // convenience) because we've got to have more careful control over it.
+        // We start a new one every so often to prevent unbounded memory growth.
+
         SkRandom rand;
+        SkPaint paint;
+        SkAutoTDelete<SkPicture> picture;
+        SkCanvas* canvas = NULL;
+        const int kMaxPaintsPerCanvas = 10000;
         for (int i = 0; i < this->getLoops(); i++) {
-            SkPaint paint;
+            if (0 == i % kMaxPaintsPerCanvas) {
+                picture.reset(SkNEW(SkPicture));
+                canvas = picture->beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT);
+            }
             paint.setColor(rand.nextU());
             canvas->drawPaint(paint);
         }
     }
 
 private:
     typedef PictureRecordBench INHERITED;
 };
 
 /*
@@ skipping 28 matching lines @@
 private:
     SkPaint fPaint [ObjCount];
     typedef PictureRecordBench INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new DictionaryRecordBench(); )
 DEF_BENCH( return new UniquePaintDictionaryRecordBench(); )
 DEF_BENCH( return new RecurringPaintDictionaryRecordBench(); )