From 49f1f34438d3431f6d7e32847accd2ba96948a73 Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Fri, 15 Sep 2017 11:37:15 -0400
Subject: use unique_ptr for stream api

Bug: skia:6888
Change-Id: I3459b4913982a7cae1c0061697c82cc65ad9a2d8
Reviewed-on: https://skia-review.googlesource.com/26740
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
---
 src/ports/SkFontMgr_android.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/ports/SkFontMgr_android.cpp')

diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp
index 2dd3221466..0ec2edba6a 100644
--- a/src/ports/SkFontMgr_android.cpp
+++ b/src/ports/SkFontMgr_android.cpp
@@ -129,7 +129,11 @@ public:
 
     SkStreamAsset* onOpenStream(int* ttcIndex) const override {
         *ttcIndex = fData->getIndex();
+#ifdef SK_SUPPORT_LEGACY_STREAM_API
         return fData->getStream()->duplicate();
+#else
+        return fData->getStream()->duplicate().release();
+#endif
     }
 
     std::unique_ptr<SkFontData> onMakeFontData() const override {
-- 
cgit v1.2.3