diff options
| author |  Mike Reed <reed@google.com> | 2017-09-15 21:39:47 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-16 02:04:23 +0000 |
| commit | 98c5d92ee60f6d395f9591891922aa9852a497ee (patch) | |
| tree | 239001c6ffe06559fd7425ba1549f30d9cbc1c37 /src/ports | |
| parent | 7e4e99386fe6e7bf131ba8461dcb1990bf15e346 (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')
| -rw-r--r-- | src/ports/SkFontMgr_FontConfigInterface.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkFontMgr_android.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkFontMgr_custom.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkFontMgr_fontconfig.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkFontMgr_win_dw.cpp | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/src/ports/SkFontMgr_FontConfigInterface.cpp b/src/ports/SkFontMgr_FontConfigInterface.cpp index 99092b6b98..aec76af685 100644 --- a/src/ports/SkFontMgr_FontConfigInterface.cpp +++ b/src/ports/SkFontMgr_FontConfigInterface.cpp @@ -26,7 +26,11 @@ SkStreamAsset* SkTypeface_FCI::onOpenStream(int* ttcIndex) const { if (!stream) { return nullptr; } +#ifdef SK_SUPPORT_LEGACY_STREAM_API return stream->duplicate(); +#else + return stream->duplicate().release(); +#endif } return fFCI->openStream(this->getIdentity()); 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 { diff --git a/src/ports/SkFontMgr_custom.cpp b/src/ports/SkFontMgr_custom.cpp index 91a590827c..b38f48c322 100644 --- a/src/ports/SkFontMgr_custom.cpp +++ b/src/ports/SkFontMgr_custom.cpp @@ -60,7 +60,11 @@ SkTypeface_Stream::SkTypeface_Stream(std::unique_ptr<SkFontData> fontData, SkStreamAsset* SkTypeface_Stream::onOpenStream(int* ttcIndex) const { *ttcIndex = fData->getIndex(); +#ifdef SK_SUPPORT_LEGACY_STREAM_API return fData->getStream()->duplicate(); +#else + return fData->getStream()->duplicate().release(); +#endif } std::unique_ptr<SkFontData> SkTypeface_Stream::onMakeFontData() const { 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 { diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index 1fd300ca1d..b349c833a0 100644 --- a/src/ports/SkFontMgr_win_dw.cpp +++ b/src/ports/SkFontMgr_win_dw.cpp @@ -86,7 +86,11 @@ HRESULT StreamFontFileLoader::CreateStreamFromKey( IDWriteFontFileStream** fontFileStream) { SkTScopedComPtr<SkDWriteFontFileStreamWrapper> stream; +#ifdef SK_SUPPORT_LEGACY_STREAM_API HR(SkDWriteFontFileStreamWrapper::Create(fStream->duplicate(), &stream)); +#else + HR(SkDWriteFontFileStreamWrapper::Create(fStream->duplicate().release(), &stream)); +#endif *fontFileStream = stream.release(); return S_OK; } |