diff options
| author |  stephana <stephana@google.com> | 2014-08-13 10:36:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-13 10:36:06 -0700 |
| commit | 21b342d19c71fa5abe7e4aa5cfb518fd04cb9d67 (patch) | |
| tree | 1c9b42a2ae539b4bcd17ab11c42b2dfca0e77411 /tools/skpdiff/SkDiffContext.h | |
| parent | 97a0d437718706b918f710fe9dfc2e7c0ba618a7 (diff) | |
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
Diffstat (limited to 'tools/skpdiff/SkDiffContext.h')
| -rw-r--r-- | tools/skpdiff/SkDiffContext.h | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/tools/skpdiff/SkDiffContext.h b/tools/skpdiff/SkDiffContext.h index 996737f2ee..8f4789fea6 100644 --- a/tools/skpdiff/SkDiffContext.h +++ b/tools/skpdiff/SkDiffContext.h @@ -52,6 +52,25 @@ public: 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 @@ public: * * 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 @@ private: SkString fAlphaMaskDir; SkString fRgbDiffDir; SkString fWhiteDiffDir; + bool longNames; }; #endif |