From ccd7afb6fb2df9774e57fb4d7f62f9504cabf03e Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Tue, 28 May 2013 16:45:07 +0000 Subject: 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 --- gm/gm_expectations.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gm/gm_expectations.h') 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, -- cgit v1.2.3