Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: dm/DMWriteTask.cpp

Issue 428443002: Cleanup: Rename SkOSPath functions. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dm/DM.cpp ('k') | experimental/PdfViewer/chop_transparency_main.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dm/DMWriteTask.cpp
diff --git a/dm/DMWriteTask.cpp b/dm/DMWriteTask.cpp
index b90e44a2aa05c17a410a13be7dff30ccda1af798..5435087535951fbe081c15aaf754ed88aab8969f 100644
--- a/dm/DMWriteTask.cpp
+++ b/dm/DMWriteTask.cpp
@@ -136,11 +136,11 @@ void WriteTask::draw() {
#endif
this->makeDirOrFail(dir);
for (int i = 0; i < fSuffixes.count(); i++) {
- dir = SkOSPath::SkPathJoin(dir.c_str(), fSuffixes[i].c_str());
+ dir = SkOSPath::Join(dir.c_str(), fSuffixes[i].c_str());
this->makeDirOrFail(dir);
}
- SkString path = SkOSPath::SkPathJoin(dir.c_str(), fGmName.c_str());
+ SkString path = SkOSPath::Join(dir.c_str(), fGmName.c_str());
path.append(fExtension);
const bool ok = fData.get() ? save_data_to_file(fData, path.c_str())
@@ -173,13 +173,13 @@ static SkString path_to_expected_image(const char* root, const Task& task) {
SkASSERT(1 == suffixes.count());
// We'll look in root/suffix for images.
- const SkString dir = SkOSPath::SkPathJoin(root, suffixes[0].c_str());
+ const SkString dir = SkOSPath::Join(root, suffixes[0].c_str());
// Remove the suffix and tack on a .png.
filename.remove(filename.size() - suffixLength, suffixLength);
filename.append(".png");
- return SkOSPath::SkPathJoin(dir.c_str(), filename.c_str());
+ return SkOSPath::Join(dir.c_str(), filename.c_str());
}
bool WriteTask::Expectations::check(const Task& task, SkBitmap bitmap) const {
« no previous file with comments | « dm/DM.cpp ('k') | experimental/PdfViewer/chop_transparency_main.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698