Clean up some dead code.

tools/PictureRenderer.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef PictureRenderer_DEFINED
 #define PictureRenderer_DEFINED
 
 #include "SkCanvas.h"
 #include "SkDrawFilter.h"
 #include "SkJSONCPP.h"
 #include "SkMath.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkString.h"
 #include "SkTDArray.h"
 #include "SkTypes.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
 #include "GrContext.h"
 #endif
 
-#include "image_expectations.h"
-
 struct GrContextOptions;
 class SkBitmap;
 class SkCanvas;
 class SkGLContext;
 class SkThread;
 
 namespace sk_tools {
 
 class TiledPictureRenderer;
 
@@ skipping 54 matching lines @@
      * @param useMultiPictureDraw true if MultiPictureDraw should be used for rendering
      */
     virtual void init(const SkPicture* pict,
                       const SkString* writePath,
                       const SkString* mismatchPath,
                       const SkString* inputFilename,
                       bool useChecksumBasedFilenames,
                       bool useMultiPictureDraw);
 
     /**
-     * TODO(epoger): Temporary hack, while we work on http://skbug.com/2584 ('bench_pictures is
-     * timing reading pixels and writing json files'), such that:
-     * - render_pictures can call this method and continue to work
-     * - any other callers (bench_pictures) will skip calls to write() by default
-     */
-    void enableWrites() { fEnableWrites = true; }
-
-    /**
      *  Set the viewport so that only the portion listed gets drawn.
      */
     void setViewport(SkISize size) { fViewport = size; }
 
     /**
      *  Set the scale factor at which draw the picture.
      */
     void setScaleFactor(SkScalar scale) { fScaleFactor = scale; }
 
     /**
@@ skipping 121 matching lines @@
             fHasDrawFilters |= SkToBool(filters[i]);
         }
     }
 
     void setBBoxHierarchyType(BBoxHierarchyType bbhType) {
         fBBoxHierarchyType = bbhType;
     }
 
     BBoxHierarchyType getBBoxHierarchyType() { return fBBoxHierarchyType; }
 
-    void setJsonSummaryPtr(ImageResultsAndExpectations* jsonSummaryPtr) {
-        fJsonSummaryPtr = jsonSummaryPtr;
-    }
-
     bool isUsingBitmapDevice() {
         return kBitmap_DeviceType == fDeviceType;
     }
 
     virtual SkString getPerIterTimeFormat() { return SkString("%.2f"); }
 
     virtual SkString getNormalTimeFormat() { return SkString("%6.2f"); }
 
     /**
      * Reports the configuration of this PictureRenderer.
@@ skipping 169 matching lines @@
 
     const SkPicture* getPicture() {
         return fPicture;
     }
 
 #if SK_SUPPORT_GPU
     explicit PictureRenderer(const GrContextOptions &opts)
 #else
     PictureRenderer()
 #endif
-        : fJsonSummaryPtr(nullptr)
-        , fDeviceType(kBitmap_DeviceType)
-        , fEnableWrites(false)
+        : fDeviceType(kBitmap_DeviceType)
         , fBBoxHierarchyType(kNone_BBoxHierarchyType)
         , fHasDrawFilters(false)
         , fScaleFactor(SK_Scalar1)
 #if SK_SUPPORT_GPU
         , fGrContextFactory(opts)
         , fGrContext(nullptr)
         , fSampleCount(0)
         , fUseDFText(false)
 #endif
         {
             sk_bzero(fDrawFilters, sizeof(fDrawFilters));
             fViewport.set(0, 0);
         }
 
 #if SK_SUPPORT_GPU
     virtual ~PictureRenderer() {
         SkSafeUnref(fGrContext);
     }
 #endif
 
 protected:
     SkAutoTUnref<SkCanvas> fCanvas;
     SkAutoTUnref<const SkPicture> fPicture;
     bool                   fUseChecksumBasedFilenames;
     bool                   fUseMultiPictureDraw;
-    ImageResultsAndExpectations*   fJsonSummaryPtr;
     SkDeviceTypes          fDeviceType;
-    bool                   fEnableWrites;
     BBoxHierarchyType      fBBoxHierarchyType;
     bool                   fHasDrawFilters;
     DrawFilterFlags        fDrawFilters[SkDrawFilter::kTypeCount];
     SkString               fDrawFiltersConfig;
     SkString               fWritePath;
     SkString               fMismatchPath;
     SkString               fInputFilename;
 
     void buildBBoxHierarchy();
 
@@ skipping 258 matching lines @@
 
 #if SK_SUPPORT_GPU
 extern PictureRenderer* CreateGatherPixelRefsRenderer(const GrContextOptions& opts);
 #else
 extern PictureRenderer* CreateGatherPixelRefsRenderer();
 #endif
 
 }
 
 #endif  // PictureRenderer_DEFINED