Use SkPathJoin and SkBasename in Pdfviewer.

experimental/PdfViewer/pdf_viewer_main.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkCommandLineFlags.h"
 #include "SkDevice.h"
@@ skipping 68 matching lines @@
         }
         if (page >= 0) {
             path->appendf("%i.", page);
         }
         path->append(new_extension);
         return true;
     }
     return false;
 }
 
-static void make_filepath(SkString* path, const SkString& dir, const SkString& name) {
-    size_t len = dir.size();
-    path->set(dir);
-    if (0 < len  && '/' != dir[len - 1]) {
-        path->append("/");
-    }
-    path->append(name);
-}
-
-static bool is_path_seperator(const char chr) {
-#if defined(SK_BUILD_FOR_WIN)
-    return chr == '\\' || chr == '/';
-#else
-    return chr == '/';
-#endif
-}
-
-static void get_basename(SkString* basename, const SkString& path) {
-    if (path.size() == 0) {
-        basename->reset();
-        return;
-    }
-
-    size_t end = path.size() - 1;
-
-    // Paths pointing to directories often have a trailing slash,
-    // we remove it so the name is not empty
-    if (is_path_seperator(path[end])) {
-        if (end == 0) {
-            basename->reset();
-            return;
-        }
-
-        end -= 1;
-    }
-
-    size_t i = end;
-    do {
-        --i;
-        if (is_path_seperator(path[i])) {
-              const char* basenameStart = path.c_str() + i + 1;
-              size_t basenameLength = end - i;
-              basename->set(basenameStart, basenameLength);
-              return;
-        }
-    } while (i > 0);
-
-    basename->set(path.c_str(), end + 1);
-}
-
 /** Builds the output filename. path = dir/name, and it replaces expected
  * .skp extension with .pdf extention.
  * @param path Output filename.
  * @param name The name of the file.
  * @returns false if the file did not has the expected extension.
  *  if false is returned, contents of path are undefined.
  */
 static bool make_output_filepath(SkString* path, const SkString& dir,
                                  const SkString& name,
                                  int page) {
-    make_filepath(path, dir, name);
+    *path = SkOSPath::SkPathJoin(dir.c_str(), name.c_str());
     return add_page_and_replace_filename_extension(path, page,
                                                    PDF_FILE_EXTENSION,
                                                    PNG_FILE_EXTENSION);
 }
 
 static void setup_bitmap(SkBitmap* bitmap, int width, int height, SkColor color) {
     bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
 
     bitmap->allocPixels();
     bitmap->eraseColor(color);
@@ skipping 97 matching lines @@
 
 /** Reads an skp file, renders it to pdf and writes the output to a pdf file
  * @param inputPath The skp file to be read.
  * @param outputDir Output dir.
  * @param renderer The object responsible to render the skp object into pdf.
  */
 static bool process_pdf(const SkString& inputPath, const SkString& outputDir,
                         SkPdfRenderer& renderer) {
     SkDebugf("Loading PDF:  %s\n", inputPath.c_str());
 
-    SkString inputFilename;
-    get_basename(&inputFilename, inputPath);
+    SkString inputFilename = SkOSPath::SkBasename(inputPath.c_str());
 
     bool success = true;
 
     success = renderer.load(inputPath);
     if (FLAGS_showMemoryUsage) {
         SkDebugf("Memory usage after load: %u\n", (unsigned int)renderer.bytesUsed());
     }
 
     // TODO(edisonn): bench timers
     if (FLAGS_benchLoad > 0) {
@@ skipping 71 matching lines @@
  * @param outputDir Output dir.
  * @param renderer The object responsible to render the skp object into pdf.
  */
 static int process_input(const char* input, const SkString& outputDir,
                          SkPdfRenderer& renderer) {
     int failures = 0;
     if (sk_isdir(input)) {
         SkOSFile::Iter iter(input, PDF_FILE_EXTENSION);
         SkString inputFilename;
         while (iter.next(&inputFilename)) {
-            SkString inputPath;
-            SkString _input;
-            _input.append(input);
-            make_filepath(&inputPath, _input, inputFilename);
+            SkString inputPath = SkOSPath::SkPathJoin(input, inputFilename.c_str());
             if (!process_pdf(inputPath, outputDir, renderer)) {
                 ++failures;
             }
         }
     } else {
         SkString inputPath(input);
         if (!process_pdf(inputPath, outputDir, renderer)) {
             ++failures;
         }
     }
@@ skipping 31 matching lines @@
     }
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif