Clean up some dead code.

tools/PictureRenderer.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 "PictureRenderer.h"
 #include "picture_utils.h"
 #include "SamplePipeControllers.h"
@@ skipping 265 matching lines @@
         return;
     }
 
     // resetState should've already done this
     fGrContext->flush();
 
     fGrContext->purgeAllUnlockedResources();
 #endif
 }
 
-/**
- * Write the canvas to an image file and/or JSON summary.
- *
- * @param canvas Must be non-null. Canvas to be written to a file.
- * @param writePath If nonempty, write the binary image to a file within this directory.
- * @param mismatchPath If nonempty, write the binary image to a file within this directory,
- *     but only if the image does not match expectations.
- * @param inputFilename If we are writing out a binary image, use this to build its filename.
- * @param jsonSummaryPtr If not null, add image results (checksum) to this summary.
- * @param useChecksumBasedFilenames If true, use checksum-based filenames when writing to disk.
- * @param tileNumberPtr If not null, which tile number this image contains.
- *
- * @return bool True if the operation completed successfully.
- */
-static bool write(SkCanvas* canvas, const SkString& writePath, const SkString& mismatchPath,
-                  const SkString& inputFilename, ImageResultsAndExpectations *jsonSummaryPtr,
-                  bool useChecksumBasedFilenames, const int* tileNumberPtr=nullptr) {
-    SkASSERT(canvas != nullptr);
-    if (nullptr == canvas) {
-        return false;
-    }
-
-    SkBitmap bitmap;
-    SkISize size = canvas->getDeviceSize();
-    setup_bitmap(&bitmap, size.width(), size.height());
-
-    canvas->readPixels(&bitmap, 0, 0);
-    force_all_opaque(bitmap);
-    BitmapAndDigest bitmapAndDigest(bitmap);
-
-    SkString escapedInputFilename(inputFilename);
-    replace_char(&escapedInputFilename, '.', '_');
-
-    // TODO(epoger): what about including the config type within outputFilename?  That way,
-    // we could combine results of different config types without conflicting filenames.
-    SkString outputFilename;
-    const char *outputSubdirPtr = nullptr;
-    if (useChecksumBasedFilenames) {
-        ImageDigest *imageDigestPtr = bitmapAndDigest.getImageDigestPtr();
-        outputSubdirPtr = escapedInputFilename.c_str();
-        outputFilename.set(imageDigestPtr->getHashType());
-        outputFilename.append("_");
-        outputFilename.appendU64(imageDigestPtr->getHashValue());
-    } else {
-        outputFilename.set(escapedInputFilename);
-        if (tileNumberPtr) {
-            outputFilename.append("-tile");
-            outputFilename.appendS32(*tileNumberPtr);
-        }
-    }
-    outputFilename.append(".png");
-
-    if (jsonSummaryPtr) {
-        ImageDigest *imageDigestPtr = bitmapAndDigest.getImageDigestPtr();
-        SkString outputRelativePath;
-        if (outputSubdirPtr) {
-            outputRelativePath.set(outputSubdirPtr);
-            outputRelativePath.append("/");  // always use "/", even on Windows
-            outputRelativePath.append(outputFilename);
-        } else {
-            outputRelativePath.set(outputFilename);
-        }
-
-        jsonSummaryPtr->add(inputFilename.c_str(), outputRelativePath.c_str(),
-                            *imageDigestPtr, tileNumberPtr);
-        if (!mismatchPath.isEmpty() &&
-            !jsonSummaryPtr->getExpectation(inputFilename.c_str(),
-                                            tileNumberPtr).matches(*imageDigestPtr)) {
-            if (!write_bitmap_to_disk(bitmap, mismatchPath, outputSubdirPtr, outputFilename)) {
-                return false;
-            }
-        }
-    }
-
-    if (writePath.isEmpty()) {
-        return true;
-    } else {
-        return write_bitmap_to_disk(bitmap, writePath, outputSubdirPtr, outputFilename);
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
 SkCanvas* RecordPictureRenderer::setupCanvas(int width, int height) {
     // defer the canvas setup until the render step
     return nullptr;
 }
 
 bool RecordPictureRenderer::render(SkBitmap** out) {
     SkAutoTDelete<SkBBHFactory> factory(this->getFactory());
     SkPictureRecorder recorder;
@@ skipping 33 matching lines @@
     SkCanvas* pipeCanvas = writer.startRecording(&pipeController);
     pipeCanvas->drawPicture(fPicture);
     writer.endRecording();
     fCanvas->flush();
     if (out) {
         *out = new SkBitmap;
         setup_bitmap(*out, SkScalarCeilToInt(fPicture->cullRect().width()),
                            SkScalarCeilToInt(fPicture->cullRect().height()));
         fCanvas->readPixels(*out, 0, 0);
     }
-    if (fEnableWrites) {
-        return write(fCanvas, fWritePath, fMismatchPath, fInputFilename, fJsonSummaryPtr,
-                     fUseChecksumBasedFilenames);
-    } else {
-        return true;
-    }
+    return true;
 }
 
 SkString PipePictureRenderer::getConfigNameInternal() {
     return SkString("pipe");
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
 void SimplePictureRenderer::init(const SkPicture* picture, const SkString* writePath,
                                  const SkString* mismatchPath, const SkString* inputFilename,
@@ skipping 19 matching lines @@
     } else {
         fCanvas->drawPicture(fPicture);
     }
     fCanvas->flush();
     if (out) {
         *out = new SkBitmap;
         setup_bitmap(*out, SkScalarCeilToInt(fPicture->cullRect().width()),
                            SkScalarCeilToInt(fPicture->cullRect().height()));
         fCanvas->readPixels(*out, 0, 0);
     }
-    if (fEnableWrites) {
-        return write(fCanvas, fWritePath, fMismatchPath, fInputFilename, fJsonSummaryPtr,
-                     fUseChecksumBasedFilenames);
-    } else {
-        return true;
-    }
+    return true;
 }
 
 SkString SimplePictureRenderer::getConfigNameInternal() {
     return SkString("simple");
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU
 TiledPictureRenderer::TiledPictureRenderer(const GrContextOptions& opts)
@@ skipping 186 matching lines @@
 void TiledPictureRenderer::drawCurrentTile() {
     SkASSERT(fCurrentTileOffset >= 0 && fCurrentTileOffset < fTileRects.count());
     draw_tile_to_canvas(fCanvas, fTileRects[fCurrentTileOffset], fPicture);
 }
 
 bool TiledPictureRenderer::postRender(SkCanvas* canvas, const SkIRect& tileRect,
                                       SkBitmap* tempBM, SkBitmap** out,
                                       int tileNumber) {
     bool success = true;
 
-    if (fEnableWrites) {
-        success &= write(canvas, fWritePath, fMismatchPath, fInputFilename, fJsonSummaryPtr,
-                         fUseChecksumBasedFilenames, &tileNumber);
-    }
     if (out) {
         if (canvas->readPixels(tempBM, 0, 0)) {
             // Add this tile to the entire bitmap.
             bitmapCopyAtOffset(*tempBM, *out, tileRect.left(), tileRect.top());
         } else {
             success = false;
         }
     }
 
     return success;
@@ skipping 134 matching lines @@
         case kNone_BBoxHierarchyType:
             return nullptr;
         case kRTree_BBoxHierarchyType:
             return new SkRTreeFactory;
     }
     SkASSERT(0); // invalid bbhType
     return nullptr;
 }
 
 } // namespace sk_tools