aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontMgr_fontconfig.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-09-15 21:39:47 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-16 02:04:23 +0000
commit98c5d92ee60f6d395f9591891922aa9852a497ee (patch)
tree239001c6ffe06559fd7425ba1549f30d9cbc1c37 /src/ports/SkFontMgr_fontconfig.cpp
parent7e4e99386fe6e7bf131ba8461dcb1990bf15e346 (diff)
Revert "Revert "use unique_ptr for stream api""
This reverts commit 7031b247c9fe0cb8fa32129f9bc24fea2043cee2. Bug: skia: Change-Id: I24c34bbee703f02994be8e206bcb9c10b5427d84 Reviewed-on: https://skia-review.googlesource.com/47541 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/ports/SkFontMgr_fontconfig.cpp')
-rw-r--r--src/ports/SkFontMgr_fontconfig.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
index 95c963d69f..8b3a058e9e 100644
--- a/src/ports/SkFontMgr_fontconfig.cpp
+++ b/src/ports/SkFontMgr_fontconfig.cpp
@@ -435,7 +435,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 {