reland "extract some common code from PictureRenderer"
re-lands https://codereview.chromium.org/273703006/
NOTRY=True
R=bungeman@google.com, djsollen@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/278633002
git-svn-id: http://skia.googlecode.com/svn/trunk@14662 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h
index 7961628..445737e 100644
--- a/tools/PictureRenderer.h
+++ b/tools/PictureRenderer.h
@@ -11,7 +11,6 @@
#include "SkCanvas.h"
#include "SkCountdown.h"
#include "SkDrawFilter.h"
-#include "SkJSONCPP.h"
#include "SkMath.h"
#include "SkPaint.h"
#include "SkPicture.h"
@@ -29,6 +28,8 @@
#include "GrContext.h"
#endif
+#include "image_expectations.h"
+
class SkBitmap;
class SkCanvas;
class SkGLContextHelper;
@@ -38,44 +39,6 @@
class TiledPictureRenderer;
-/**
- * Class for collecting image results (checksums) as we go.
- */
-class ImageResultsSummary {
-public:
- /**
- * Adds this image to the summary of results.
- *
- * @param sourceName name of the source file that generated this result
- * @param fileName relative path to the image output file on local disk
- * @param hash hash to store
- * @param tileNumber if not NULL, ptr to tile number
- */
- void add(const char *sourceName, const char *fileName, uint64_t hash,
- const int *tileNumber=NULL);
-
- /**
- * Adds this image to the summary of results.
- *
- * @param sourceName name of the source file that generated this result
- * @param fileName relative path to the image output file on local disk
- * @param bitmap bitmap to store the hash of
- * @param tileNumber if not NULL, ptr to tile number
- */
- void add(const char *sourceName, const char *fileName, const SkBitmap& bitmap,
- const int *tileNumber=NULL);
-
- /**
- * Writes the summary (as constructed so far) to a file.
- *
- * @param filename path to write the summary to
- */
- void writeToFile(const char *filename);
-
-private:
- Json::Value fActualResults;
-};
-
class PictureRenderer : public SkRefCnt {
public: