diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ports/SkFontHost_linux.cpp | 5 | ||||
| -rw-r--r-- | src/utils/SkOSFile.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp index 498d69ffe0..891e4617f3 100644 --- a/src/ports/SkFontHost_linux.cpp +++ b/src/ports/SkFontHost_linux.cpp @@ -323,7 +323,7 @@ private: while (iter.next(&name, false)) { SkString filename( - SkOSPath::SkPathJoin(directory.c_str(), name.c_str())); + SkOSPath::Join(directory.c_str(), name.c_str())); bool isFixedPitch; SkString realname; @@ -354,8 +354,7 @@ private: if (name.startsWith(".")) { continue; } - SkString dirname( - SkOSPath::SkPathJoin(directory.c_str(), name.c_str())); + SkString dirname(SkOSPath::Join(directory.c_str(), name.c_str())); load_directory_fonts(dirname); } } diff --git a/src/utils/SkOSFile.cpp b/src/utils/SkOSFile.cpp index 20ee3a4aad..8baf08ffdd 100644 --- a/src/utils/SkOSFile.cpp +++ b/src/utils/SkOSFile.cpp @@ -6,7 +6,7 @@ */ #include "SkOSFile.h" -SkString SkOSPath::SkPathJoin(const char *rootPath, const char *relativePath) { +SkString SkOSPath::Join(const char *rootPath, const char *relativePath) { SkString result(rootPath); if (!result.endsWith(SkPATH_SEPARATOR)) { result.appendUnichar(SkPATH_SEPARATOR); @@ -15,7 +15,7 @@ SkString SkOSPath::SkPathJoin(const char *rootPath, const char *relativePath) { return result; } -SkString SkOSPath::SkBasename(const char* fullPath) { +SkString SkOSPath::Basename(const char* fullPath) { if (!fullPath) { return SkString(); } |