commit a8e2e1504b9af6ba791637f228debaa23953064a
author tfarina <tfarina@chromium.org> Mon Jul 28 19:26:58 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 28 19:26:58 2014 -0700
tree c4dc50d10bb27a4bfd263f877cb7d602f6779afc
parent 2bff230d835fbc84f0ce8b2e7a399fe8416ec7c8

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

src/ports/SkFontHost_linux.cpp

diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp
index 498d69f..891e461 100644
--- a/src/ports/SkFontHost_linux.cpp
+++ b/src/ports/SkFontHost_linux.cpp
@@ -323,7 +323,7 @@
 
         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 @@
             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);
         }
     }

src/utils/SkOSFile.cpp

diff --git a/src/utils/SkOSFile.cpp b/src/utils/SkOSFile.cpp
index 20ee3a4..8baf08f 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 @@
     return result;
 }
 
-SkString SkOSPath::SkBasename(const char* fullPath) {
+SkString SkOSPath::Basename(const char* fullPath) {
     if (!fullPath) {
         return SkString();
     }