SkFontData to use smart pointers.

include/core/SkStream.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkStream_DEFINED
 #define SkStream_DEFINED
 
@@ skipping 22 matching lines @@
  *  always return all N bytes of the request if possible. If they return fewer
  *  (the read() call returns the number of bytes read) then that means there is
  *  no more data (at EOF or hit an error). The caller should *not* call again
  *  in hopes of fulfilling more of the request.
  */
 class SK_API SkStream : public SkNoncopyable {
 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.
      *  If buffer != NULL, copy size bytes into buffer, return how many were copied.
      *  @param buffer when NULL skip size bytes, otherwise copy size bytes into buffer
      *  @param size the number of bytes to skip or copy
      *  @return the number of bytes actually read.
      */
     virtual size_t read(void* buffer, size_t size) = 0;
 
@@ skipping 402 matching lines @@
 
 private:
     size_t fBytesWritten;
     typedef SkWStream INHERITED;
 };
 
 // for now
 typedef SkFILEStream SkURLStream;
 
 #endif