Cleanup: Rename SkOSPath functions.

samplecode/SampleUnpremul.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 "gm.h"
 
 #include "Resources.h"
@@ skipping 88 matching lines @@
             if (fResPath.size() == 0) {
                 failure.printf("resource path is required!");
             } else {
                 failure.printf("Failed to decode %s", fCurrFile.c_str());
             }
             canvas->drawText(failure.c_str(), failure.size(), 0, height, paint);
             return;
         }
 
         // Name, size of the file, and whether or not it is premultiplied.
-        SkString header(SkOSPath::SkBasename(fCurrFile.c_str()));
+        SkString header(SkOSPath::Basename(fCurrFile.c_str()));
         header.appendf("     [%dx%d]     %s", fBitmap.width(), fBitmap.height(),
                        (fPremul ? "premultiplied" : "unpremultiplied"));
         canvas->drawText(header.c_str(), header.size(), 0, height, paint);
         canvas->translate(0, height);
 
         // Help messages
         header.printf("Press '%c' to move to the next image.'", fNextImageChar);
         canvas->drawText(header.c_str(), header.size(), 0, height, paint);
         canvas->translate(0, height);
 
@@ skipping 40 matching lines @@
             return;
         }
         SkString basename;
         if (!fFileIter.next(&basename)) {
             fFileIter.reset(fResPath.c_str());
             if (!fFileIter.next(&basename)) {
                 // Perhaps this should draw some error message?
                 return;
             }
         }
-        fCurrFile = SkOSPath::SkPathJoin(fResPath.c_str(), basename.c_str());
+        fCurrFile = SkOSPath::Join(fResPath.c_str(), basename.c_str());
         this->decodeCurrFile();
     }
 
     void decodeCurrFile() {
         if (fCurrFile.size() == 0) {
             fDecodeSucceeded = false;
             return;
         }
         SkFILEStream stream(fCurrFile.c_str());
         SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(&stream));
@@ skipping 16 matching lines @@
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() {
     return new UnpremulView(GetResourcePath());
 }
 static SkViewRegister reg(MyFactory);