SkDynamicMemoryWStream::detachAsStream() returns unique_ptr

https://crrev.com/2747183002 must land first.
Change-Id: I65d1285a24d63c2c2f18662d511dea1c399511e1
Reviewed-on: https://skia-review.googlesource.com/9682
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index 133df83078..f0e16a6ff6 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -759,12 +759,13 @@ private:
     size_t fCurrentOffset;
 };
 
-SkStreamAsset* SkDynamicMemoryWStream::detachAsStream() {
-    auto stream = skstd::make_unique<SkBlockMemoryStream>(sk_make_sp<SkBlockMemoryRefCnt>(fHead),
-                                                          this->bytesWritten());
+std::unique_ptr<SkStreamAsset> SkDynamicMemoryWStream::detachAsStream() {
+    std::unique_ptr<SkStreamAsset> stream
+            = skstd::make_unique<SkBlockMemoryStream>(sk_make_sp<SkBlockMemoryRefCnt>(fHead),
+                                                      this->bytesWritten());
     fHead = nullptr;    // signal reset() to not free anything
     this->reset();
-    return stream.release();
+    return stream;
 }
 
 ///////////////////////////////////////////////////////////////////////////////