This eliminates the need to copy the generated images from a temporary directory to the directory that is served by the rebaseline_server.
BUG=skia:2815, skia:2818
R=epoger@google.com
Author: stephana@google.com
Review URL: https://codereview.chromium.org/457203003
diff --git a/tools/skpdiff/SkDiffContext.h b/tools/skpdiff/SkDiffContext.h
index 996737f..8f4789f 100644
--- a/tools/skpdiff/SkDiffContext.h
+++ b/tools/skpdiff/SkDiffContext.h
@@ -52,6 +52,25 @@
void setWhiteDiffDir(const SkString& directory);
/**
+ * Modify the pattern used to generate commonName (= the
+ * basename of rgb/white diff files).
+ *
+ * - true: basename is a combination of the input file names.
+ * - false: basename is the common prefix of the input file names.
+ *
+ * For example, for:
+ * baselinePath=/tmp/dir/image-before.png
+ * testPath=/tmp/dir/image-after.png
+ *
+ * If setLongNames(true), commonName would be:
+ * image-before-png-vs-image-after-png.png
+ *
+ * If setLongNames(false), commonName would be:
+ * image-.png
+ */
+ void setLongNames(const bool useLongNames);
+
+ /**
* Sets the differs to be used in each diff. Already started diffs will not retroactively use
* these.
* @param differs An array of differs to use. The array is copied, but not the differs
@@ -85,8 +104,9 @@
*
* The format of the JSON document is one top level array named "records".
* Each record in the array is an object with the following values:
- * "commonName" : string containing the common prefix of the baselinePath
- * and testPath filenames
+ * "commonName" : string containing the output filename (basename)
+ * depending on the value of 'longNames'.
+ * (see 'setLongNames' for an explanation and example).
* "baselinePath" : string containing the path to the baseline image
* "testPath" : string containing the path to the test image
* "differencePath" : (optional) string containing the path to an alpha
@@ -177,6 +197,7 @@
SkString fAlphaMaskDir;
SkString fRgbDiffDir;
SkString fWhiteDiffDir;
+ bool longNames;
};
#endif