Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / tools / picture_utils.cpp

diff --git a/src/third_party/skia/tools/picture_utils.cpp b/src/third_party/skia/tools/picture_utils.cpp
index 597fd48..6a35dd1 100644 (file)
--- a/src/third_party/skia/tools/picture_utils.cpp
+++ b/src/third_party/skia/tools/picture_utils.cpp
@@ -55,12 +55,12 @@ namespace sk_tools {
                               const char *subdirOrNull, const SkString& baseName) {
         SkString partialPath;
         if (subdirOrNull) {
-            partialPath = SkOSPath::SkPathJoin(dirPath.c_str(), subdirOrNull);
+            partialPath = SkOSPath::Join(dirPath.c_str(), subdirOrNull);
             sk_mkdir(partialPath.c_str());
         } else {
             partialPath.set(dirPath);
         }
-        SkString fullPath = SkOSPath::SkPathJoin(partialPath.c_str(), baseName.c_str());
+        SkString fullPath = SkOSPath::Join(partialPath.c_str(), baseName.c_str());
         if (SkImageEncoder::EncodeFile(fullPath.c_str(), bm, SkImageEncoder::kPNG_Type, 100)) {
             return true;
         } else {