SkFontData to use smart pointers.

include/core/SkStream.h

Index: include/core/SkStream.h
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index 48ac577070b289a7ef31016b68c302fd32a5f6e8..d77685e5d1378b88f94c1c81842dc9bc8830e401 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -40,11 +40,19 @@ public:
     virtual ~SkStream() {}
 
     /**
+     *  Attempts to open the specified file as a stream, returns nullptr on failure.
+     */
+
+    static std::unique_ptr<SkStreamAsset> MakeFromFile(const char path[]);
+
+    /**
      *  Attempts to open the specified file, and return a stream to it (using
      *  mmap if available). On success, the caller is responsible for deleting.
      *  On failure, returns NULL.
      */
-    static SkStreamAsset* NewFromFile(const char path[]);
+    static SkStreamAsset* NewFromFile(const char path[]) {

[reed1, 2016/09/15 13:38:49]

can we add a guard to deprecate/remove this version?

[bungeman-skia, 2016/09/15 16:35:47]

I don't see anyone else using it, so I think it can be removed if everything
else updates at the same time.

Done.

+        return SkStream::MakeFromFile(path).release();
+    }
 
     /** Reads or skips size number of bytes.
      *  If buffer == NULL, skip size bytes, return how many were skipped.