diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-28 16:45:07 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-28 16:45:07 +0000 |
| commit | ccd7afb6fb2df9774e57fb4d7f62f9504cabf03e (patch) | |
| tree | 54818885b59f98ac958e6c35d67109b098f26a19 /gm/gm_expectations.h | |
| parent | 7b06ba45b34855a5bb16f9c729813173d7dfe47d (diff) | |
Reland 'Add path utils, plus a test for it.'
Build SkPathJoin and SkBasename on windows also.
Previous CL did not build on Windows because the two functions were
accidentally placed inside an ifdef that did not include windows.
Move the functions to the top of the file, and add a comment by the
endif for clarity.
Previously reviewed at https://codereview.chromium.org/15747004/
Review URL: https://codereview.chromium.org/15740024
git-svn-id: http://skia.googlecode.com/svn/trunk@9295 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/gm_expectations.h')
| -rw-r--r-- | gm/gm_expectations.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/gm/gm_expectations.h b/gm/gm_expectations.h index 8efb986713..55122d4ab8 100644 --- a/gm/gm_expectations.h +++ b/gm/gm_expectations.h @@ -32,16 +32,6 @@ namespace skiagm { void gm_fprintf(FILE *stream, const char format[], ...); - /** - * Assembles rootPath and relativePath into a single path, like this: - * rootPath/relativePath - * - * Uses SkPATH_SEPARATOR, to work on all platforms. - * - * TODO(epoger): This should probably move into SkOSFile.h - */ - SkString SkPathJoin(const char *rootPath, const char *relativePath); - Json::Value CreateJsonTree(Json::Value expectedResults, Json::Value actualResultsFailed, Json::Value actualResultsFailureIgnored, |