Add path utils, plus a test for it.

gm/image.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 "SkSurface.h"
 #include "SkCanvas.h"
+#include "SkData.h"
+#include "SkOSFile.h"
 #include "SkStream.h"
-#include "SkData.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 
 namespace skiagm {
 extern GrContext* GetGr();
 };
 #endif
 
 static SkData* fileToData(const char path[]) {
     SkFILEStream stream(path);
     if (!stream.isValid()) {
         return SkData::NewEmpty();
     }
     size_t size = stream.getLength();
     void* mem = sk_malloc_throw(size);
     stream.read(mem, size);
     return SkData::NewFromMalloc(mem, size);
 }
 
-static void drawJpeg(SkCanvas* canvas, const SkISize& size) {
-    SkAutoDataUnref data(fileToData("/Users/mike/Downloads/skia.google.jpeg"));
+static void drawJpeg(SkString filename, SkCanvas* canvas, const SkISize& size) {
+    SkAutoDataUnref data(fileToData(filename.c_str()));
     SkImage* image = SkImage::NewEncodedData(data);
     if (image) {
         SkAutoCanvasRestore acr(canvas, true);
         canvas->scale(size.width() * 1.0f / image->width(),
                       size.height() * 1.0f / image->height());
         image->draw(canvas,0, 0, NULL);
         image->unref();
     }
 }
 
@@ skipping 71 matching lines @@
 protected:
     virtual SkString onShortName() {
         return SkString("image-surface");
     }
 
     virtual SkISize onISize() {
         return SkISize::Make(800, 500);
     }
 
     virtual void onDraw(SkCanvas* canvas) {
-        drawJpeg(canvas, this->getISize());
+        SkString filename = SkOSPathUtils::SkPathJoin(
+                INHERITED::gResourcePath.c_str(), "CMYK.jpg");

[scroggo, 2013/05/24 16:23:37]

Changing this file will require a rebaseline (assuming we have a checked in
expectation for this test). Should I go ahead and make the change and
rebaseline, or leave this change out?

[epoger, 2013/05/24 16:42:55]

I think your best bet is to leave this change out (add a TODO instead), since
it's separate from the main reason for your change.  I would hate for you to
have to revert this CL because of problems with this one test, etc.

[scroggo, 2013/05/24 17:36:05]

Done.

+        drawJpeg(filename, canvas, this->getISize());
 
         canvas->scale(2, 2);
 
         static const char* kLabel1 = "Original Img";
         static const char* kLabel2 = "Modified Img";
         static const char* kLabel3 = "Cur Surface";
 
         static const char* kLabel4 = "Pre-Alloc Img";
         static const char* kLabel5 = "New Alloc Img";
         static const char* kLabel6 = "SkPicture";
@@ skipping 48 matching lines @@
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new ImageGM; }
 static skiagm::GMRegistry reg(MyFactory);