aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontMgr_android.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-09-15 11:37:15 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-15 18:46:45 +0000
commit49f1f34438d3431f6d7e32847accd2ba96948a73 (patch)
treec4e0342c3350c546573fb2add99597e92c9ca66c /src/ports/SkFontMgr_android.cpp
parent226e2032e8e37068a409aeb37aac79608fbd315d (diff)
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>
Diffstat (limited to 'src/ports/SkFontMgr_android.cpp')
-rw-r--r--src/ports/SkFontMgr_android.cpp4
1 files changed, 4 insertions, 0 deletions
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 {