Cleanup usage of GetResourcePath() after commit bcbc1788b478b1e54079318ad073e8490aa66fae.

samplecode/SamplePicture.cpp

 /*
  * Copyright 2011 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 19 matching lines @@
 #include "SkTypeface.h"
 #include "SkUtils.h"
 #include "SkView.h"
 #include "SkXMLParser.h"
 #include "SkXfermode.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static SkBitmap load_bitmap() {
     SkBitmap bm;
-    SkString resourcePath = GetResourcePath();
-    SkString path = SkOSPath::SkPathJoin(resourcePath.c_str(), "mandrill_512.png");
-    SkAutoDataUnref data(SkData::NewFromFileName(path.c_str()));
+    SkString pngFilename = GetResourcePath("mandrill_512.png");
+    SkAutoDataUnref data(SkData::NewFromFileName(pngFilename.c_str()));
     if (data.get() != NULL) {
         SkInstallDiscardablePixelRef(SkDecodingImageGenerator::Create(
             data, SkDecodingImageGenerator::Options()), &bm);
     }
     return bm;
 }
 
 static void drawCircle(SkCanvas* canvas, int r, SkColor color) {
     SkPaint paint;
     paint.setAntiAlias(true);
@@ skipping 140 matching lines @@
     SkPicture*  fPicture;
     SkPicture*  fSubPicture;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new PictureView; }
 static SkViewRegister reg(MyFactory);