Update old tools to allow MultiPictureDraw rendering

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
 
@@ skipping 70 matching lines @@
      * Called with each new SkPicture to render.
      *
      * @param pict The SkPicture to render.
      * @param writePath The output directory within which this renderer should write all images,
      *     or NULL if this renderer should not write all images.
      * @param mismatchPath The output directory within which this renderer should write any images
      *     which do not match expectations, or NULL if this renderer should not write mismatches.
      * @param inputFilename The name of the input file we are rendering.
      * @param useChecksumBasedFilenames Whether to use checksum-based filenames when writing
      *     bitmap images to disk.
+     * @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 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; }
 
     /**
@@ skipping 331 matching lines @@
 #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;
     DrawFilterFlags        fDrawFilters[SkDrawFilter::kTypeCount];
     SkString               fDrawFiltersConfig;
     SkString               fWritePath;
     SkString               fMismatchPath;
     SkString               fInputFilename;
     SkTileGridFactory::TileGridInfo fGridInfo; // used when fBBoxHierarchyType is TileGrid
@@ skipping 83 matching lines @@
 class SimplePictureRenderer : public PictureRenderer {
 public:
 #if SK_SUPPORT_GPU
     SimplePictureRenderer(const GrContext::Options &opts) : INHERITED(opts) { }
 #endif
 
     virtual void init(const SkPicture* pict,
                       const SkString* writePath,
                       const SkString* mismatchPath,
                       const SkString* inputFilename,
-                      bool useChecksumBasedFilenames) SK_OVERRIDE;
+                      bool useChecksumBasedFilenames,
+                      bool useMultiPictureDraw) SK_OVERRIDE;
 
     virtual bool render(SkBitmap** out = NULL) SK_OVERRIDE;
 
 private:
     virtual SkString getConfigNameInternal() SK_OVERRIDE;
 
     typedef PictureRenderer INHERITED;
 };
 
 class TiledPictureRenderer : public PictureRenderer {
 public:
 #if SK_SUPPORT_GPU
     TiledPictureRenderer(const GrContext::Options &opts);
 #else
     TiledPictureRenderer();
 #endif
 
     virtual void init(const SkPicture* pict,
                       const SkString* writePath,
                       const SkString* mismatchPath,
                       const SkString* inputFilename,
-                      bool useChecksumBasedFilenames) SK_OVERRIDE;
+                      bool useChecksumBasedFilenames,
+                      bool useMultiPictureDraw) SK_OVERRIDE;
 
     /**
      * Renders to tiles, rather than a single canvas.
      * If fWritePath was provided, a separate file is
      * created for each tile, named "path0.png", "path1.png", etc.
      */
     virtual bool render(SkBitmap** out = NULL) SK_OVERRIDE;
 
     virtual void end() SK_OVERRIDE;
 
@@ skipping 68 matching lines @@
     bool nextTile(int& i, int& j);
 
     /**
      * Render one tile. This will draw the same tile each time it is called until nextTile is
      * called. The tile rendered will depend on how many calls have been made to nextTile.
      * It is an error to call this without first calling nextTile, or if nextTile returns false.
      */
     void drawCurrentTile();
 
 protected:
-    SkTDArray<SkRect> fTileRects;
+    SkTDArray<SkIRect> fTileRects;
 
     virtual SkCanvas* setupCanvas(int width, int height) SK_OVERRIDE;
     virtual SkString getConfigNameInternal() SK_OVERRIDE;
 
 private:
     int    fTileWidth;
     int    fTileHeight;
     double fTileWidthPercentage;
     double fTileHeightPercentage;
     int    fTileMinPowerOf2Width;
 
     // These variables are only used for timing individual tiles.
     // Next tile to draw in fTileRects.
     int    fCurrentTileOffset;
     // Number of tiles in the x direction.
     int    fTilesX;
     // Number of tiles in the y direction.
     int    fTilesY;
 
     void setupTiles();
     void setupPowerOf2Tiles();
+    bool postRender(SkCanvas*, const SkIRect& tileRect, 
+                    SkBitmap* tempBM, SkBitmap** out,
+                    int tileNumber);
 
     typedef PictureRenderer INHERITED;
 };
 
 /**
  * This class does not do any rendering, but its render function executes turning an SkPictureRecord
  * into an SkPicturePlayback, which we want to time.
  */
 class PlaybackCreationRenderer : public PictureRenderer {
 public:
@@ skipping 19 matching lines @@
 
 #if SK_SUPPORT_GPU
 extern PictureRenderer* CreateGatherPixelRefsRenderer(const GrContext::Options& opts);
 #else
 extern PictureRenderer* CreateGatherPixelRefsRenderer();
 #endif
 
 }
 
 #endif  // PictureRenderer_DEFINED