Refactored the bitmap creation into PictureRenderer.

Further, the picture is also stored in the PictureRenderer.

The main gain of all of this is that we will not have to change how the device in more than one place when we end up adding different devices.

Review URL: https://codereview.appspot.com/6458074

git-svn-id: http://skia.googlecode.com/svn/trunk@4990 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 15 insertions, 5 deletions

diff --git a/tools/PictureBenchmark.h b/tools/PictureBenchmark.h
index 37487a3e66..53ab5c2443 100644
--- a/tools/PictureBenchmark.h
+++ b/tools/PictureBenchmark.h
@@ -30,30 +30,37 @@ public:
 
 protected:
     int fRepeats;
+
+private:
+    typedef SkRefCnt INHERITED;
 };
 
 class PipePictureBenchmark : public PictureBenchmark {
 public:
-    virtual void run(SkPicture* pict);
+    virtual void run(SkPicture* pict) SK_OVERRIDE;
 private:
     PipePictureRenderer renderer;
+    typedef PictureBenchmark INHERITED;
 };
 
 class RecordPictureBenchmark : public PictureBenchmark {
 public:
-    virtual void run(SkPicture* pict);
+    virtual void run(SkPicture* pict) SK_OVERRIDE;
+private:
+    typedef PictureBenchmark INHERITED;
 };
 
 class SimplePictureBenchmark : public PictureBenchmark {
 public:
-    virtual void run(SkPicture* pict);
+    virtual void run(SkPicture* pict) SK_OVERRIDE;
 private:
     SimplePictureRenderer renderer;
+    typedef PictureBenchmark INHERITED;
 };
 
 class TiledPictureBenchmark : public PictureBenchmark {
 public:
-    virtual void run(SkPicture* pict);
+    virtual void run(SkPicture* pict) SK_OVERRIDE;
 
     void setTileWidth(int width) {
         renderer.setTileWidth(width);
@@ -89,11 +96,14 @@ public:
 
 private:
     TiledPictureRenderer renderer;
+    typedef PictureBenchmark INHERITED;
 };
 
 class UnflattenPictureBenchmark : public PictureBenchmark {
 public:
-    virtual void run(SkPicture* pict);
+    virtual void run(SkPicture* pict) SK_OVERRIDE;
+private:
+    typedef PictureBenchmark INHERITED;
 };
 
 }