Merged bench_pictures and render_pictures rendering methods.

bench_pictures now uses a class based method for choosing the benchmark type as well.

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

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

1 files changed, 7 insertions, 3 deletions

diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index 5f3496c60f..c6abc1d2f8 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -45,9 +45,7 @@ void TiledPictureRenderer::init(const SkPicture& pict) {
 }
 
 void TiledPictureRenderer::render(SkPicture* pict, SkCanvas* canvas) {
-    for (int i = 0; i < fTiles.count(); ++i) {
-        fTiles[i].fCanvas->drawPicture(*pict);
-    }
+    drawTiles(pict);
 
     copyTilesToCanvas(*pict, canvas);
 }
@@ -92,6 +90,12 @@ void TiledPictureRenderer::deleteTiles() {
     fTiles.reset();
 }
 
+void TiledPictureRenderer::drawTiles(SkPicture* pict) {
+    for (int i = 0; i < fTiles.count(); ++i) {
+        fTiles[i].fCanvas->drawPicture(*pict);
+    }
+}
+
 void TiledPictureRenderer::copyTilesToCanvas(const SkPicture& pict, SkCanvas* destination) {
     int tile_index = 0;
     for (int tile_y_start = 0; tile_y_start < pict.height();