DM: paths as implict strings too.

dm/DMSrcSink.h

 #ifndef DMSrcSink_DEFINED
 #define DMSrcSink_DEFINED
 
 #include "DMGpuSupport.h"
 #include "SkBBHFactory.h"
 #include "SkBBoxHierarchy.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkGPipe.h"
 #include "SkNullCanvas.h"
 #include "SkPicture.h"
 #include "gm.h"
 
 namespace DM {
 
 // This is just convenience.  It lets you use either return "foo" or return SkStringPrintf(...).
 struct ImplicitString : public SkString {
     template <typename T>
     ImplicitString(const T& s) : SkString(s) {}
 };
 typedef ImplicitString Error;
 typedef ImplicitString Name;
+typedef ImplicitString Path;
 
 struct Src {
     // All Srcs must be thread safe.
     virtual ~Src() {}
     virtual Error SK_WARN_UNUSED_RESULT draw(SkCanvas*) const = 0;
     virtual SkISize size() const = 0;
     virtual Name name() const = 0;
 };
 
 struct Sink {
@@ skipping 19 matching lines @@
 
     Error draw(SkCanvas*) const SK_OVERRIDE;
     SkISize size() const SK_OVERRIDE;
     Name name() const SK_OVERRIDE;
 private:
     skiagm::GMRegistry::Factory fFactory;
 };
 
 class ImageSrc : public Src {
 public:
-    explicit ImageSrc(SkString path, int subsets = 0);
+    explicit ImageSrc(Path path, int subsets = 0);
 
     Error draw(SkCanvas*) const SK_OVERRIDE;
     SkISize size() const SK_OVERRIDE;
     Name name() const SK_OVERRIDE;
 private:
-    SkString                     fPath;
-    int                          fSubsets;
+    Path fPath;
+    int  fSubsets;
 };
 
 class SKPSrc : public Src {
 public:
-    explicit SKPSrc(SkString path);
+    explicit SKPSrc(Path path);
 
     Error draw(SkCanvas*) const SK_OVERRIDE;
     SkISize size() const SK_OVERRIDE;
     Name name() const SK_OVERRIDE;
 private:
-    SkString                        fPath;
+    Path fPath;
 };
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 class GPUSink : public Sink {
 public:
     GPUSink(GrContextFactory::GLContextType, GrGLStandard, int samples, bool dfText, bool threaded);
 
     Error draw(const Src&, SkBitmap*, SkWStream*) const SK_OVERRIDE;
     int enclave() const SK_OVERRIDE;
@@ skipping 89 matching lines @@
     Error draw(const Src& src, SkBitmap*, SkWStream* out) const SK_OVERRIDE {
         return src.draw(SkCreateNullCanvas());
     }
     int enclave() const SK_OVERRIDE { return kAnyThread_Enclave; }
     const char* fileExtension() const SK_OVERRIDE { return ""; }
 };
 
 }  // namespace DM
 
 #endif//DMSrcSink_DEFINED