Call write() within render_pictures but not bench_pictures

tools/PictureRenderer.cpp

Index: tools/PictureRenderer.cpp
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index b15b4a798338444a6de64782fa8b326d3dccb22d..d2d9cd7e9814326ea8100daf2f345bbac8e0456b 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -397,9 +397,10 @@ bool PipePictureRenderer::render(SkBitmap** out) {
         *out = SkNEW(SkBitmap);
         setup_bitmap(*out, fPicture->width(), fPicture->height());
         fCanvas->readPixels(*out, 0, 0);
+        return write(fCanvas, fWritePath, fMismatchPath, fInputFilename, fJsonSummaryPtr,

[epoger, 2014/05/21 19:25:37]

The changes in here were exactly what Brian sent me in
https://codereview.chromium.org/286903014/ ('Remove calls to write() from
bench_pictures timing loop').

I tried to add the unittest disablement as a patch to that same CL, but Rietveld
wouldn't let me:
Issue creation errors: {'user': ["You (epoger@google.com) don't own this issue
(286903014)"]}

+                     fUseChecksumBasedFilenames);
     }
-    return write(fCanvas, fWritePath, fMismatchPath, fInputFilename, fJsonSummaryPtr,
-                 fUseChecksumBasedFilenames);
+    return true;
 }
 
 SkString PipePictureRenderer::getConfigNameInternal() {
@@ -428,9 +429,10 @@ bool SimplePictureRenderer::render(SkBitmap** out) {
         *out = SkNEW(SkBitmap);
         setup_bitmap(*out, fPicture->width(), fPicture->height());
         fCanvas->readPixels(*out, 0, 0);
+        return write(fCanvas, fWritePath, fMismatchPath, fInputFilename, fJsonSummaryPtr,
+                     fUseChecksumBasedFilenames);
     }
-    return write(fCanvas, fWritePath, fMismatchPath, fInputFilename, fJsonSummaryPtr,
-                 fUseChecksumBasedFilenames);
+    return true;
 }
 
 SkString SimplePictureRenderer::getConfigNameInternal() {
@@ -640,9 +642,9 @@ bool TiledPictureRenderer::render(SkBitmap** out) {
     bool success = true;
     for (int i = 0; i < fTileRects.count(); ++i) {
         draw_tile_to_canvas(fCanvas, fTileRects[i], fPicture);
-        success &= write(fCanvas, fWritePath, fMismatchPath, fInputFilename, fJsonSummaryPtr,
-                         fUseChecksumBasedFilenames, &i);
         if (NULL != out) {
+            success &= write(fCanvas, fWritePath, fMismatchPath, fInputFilename, fJsonSummaryPtr,
+                             fUseChecksumBasedFilenames, &i);
             if (fCanvas->readPixels(&bitmap, 0, 0)) {
                 // Add this tile to the entire bitmap.
                 bitmapCopyAtOffset(bitmap, *out, SkScalarFloorToInt(fTileRects[i].left()),