diff options
| author |  tfarina <tfarina@chromium.org> | 2014-07-28 19:26:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-28 19:26:58 -0700 |
| commit | a8e2e1504b9af6ba791637f228debaa23953064a (patch) | |
| tree | c4dc50d10bb27a4bfd263f877cb7d602f6779afc /bench | |
| parent | 2bff230d835fbc84f0ce8b2e7a399fe8416ec7c8 (diff) | |
Cleanup: Rename SkOSPath functions.
Mostly for brevity and matches better with Python:
Python | Old C++ | New C++
os.path.join | SkOSPath::SkPathJoin | SkOSPath::Join
os.path.basename | SkOSPath::SkBasename | SkOSPath::Basename
BUG=None
TEST=make all
R=mtklein@google.com, bsalomon@google.com
Author: tfarina@chromium.org
Review URL: https://codereview.chromium.org/428443002
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/DecodeBench.cpp | 2 | ||||
| -rw-r--r-- | bench/ImageDecodeBench.cpp | 2 | ||||
| -rw-r--r-- | bench/SkipZeroesBench.cpp | 3 | ||||
| -rw-r--r-- | bench/benchmain.cpp | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/bench/DecodeBench.cpp b/bench/DecodeBench.cpp index a4717f8eb7..b03f8980cd 100644 --- a/bench/DecodeBench.cpp +++ b/bench/DecodeBench.cpp @@ -20,7 +20,7 @@ class DecodeBench : public Benchmark { SkString fName; public: DecodeBench(SkColorType ct) : fPrefColorType(ct) { - SkString fname = SkOSPath::SkBasename(FLAGS_decodeBenchFilename[0]); + SkString fname = SkOSPath::Basename(FLAGS_decodeBenchFilename[0]); fName.printf("decode_%s_%s", sk_tool_utils::colortype_name(ct), fname.c_str()); } diff --git a/bench/ImageDecodeBench.cpp b/bench/ImageDecodeBench.cpp index 47993cfa7d..3ce2fb0afe 100644 --- a/bench/ImageDecodeBench.cpp +++ b/bench/ImageDecodeBench.cpp @@ -25,7 +25,7 @@ public: , fFilename(filename) , fStream() , fValid(false) { - fName.append(SkOSPath::SkBasename(filename)); + fName.append(SkOSPath::Basename(filename)); } virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { diff --git a/bench/SkipZeroesBench.cpp b/bench/SkipZeroesBench.cpp index 30d9377a5e..fc25f8b074 100644 --- a/bench/SkipZeroesBench.cpp +++ b/bench/SkipZeroesBench.cpp @@ -52,8 +52,7 @@ protected: return; } - SkString fullPath = SkOSPath::SkPathJoin(resourcePath.c_str(), - fFilename.c_str()); + SkString fullPath = SkOSPath::Join(resourcePath.c_str(), fFilename.c_str()); SkFILEStream fileStream(fullPath.c_str()); fValid = fileStream.isValid() && fileStream.getLength() > 0; if (fValid) { diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp index f3fdb9f8da..9c5f0e9bd7 100644 --- a/bench/benchmain.cpp +++ b/bench/benchmain.cpp @@ -108,7 +108,7 @@ static void saveFile(const char name[], const char config[], const char dir[], SkString filename; make_filename(name, &filename); filename.appendf("_%s.png", config); - SkString path = SkOSPath::SkPathJoin(dir, filename.c_str()); + SkString path = SkOSPath::Join(dir, filename.c_str()); ::remove(path.c_str()); SkFILEWStream stream(path.c_str()); |