diff options
author | Lei Zhang <thestig@chromium.org> | 2017-12-12 18:50:39 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-12 18:50:39 +0000 |
commit | 4b004930490e416a2a404deee5de4b97e649a1c1 (patch) | |
tree | 349bbf1c5307981ec1fa256cbc94de698493b9da /core/fxge/cfx_facecache.cpp | |
parent | f3a7edc07aee2a12cf02ee33471c45b4c6b00307 (diff) | |
download | pdfium-4b004930490e416a2a404deee5de4b97e649a1c1.tar.xz |
Roll DEPS for Skia to 40ca2087.
Routine roll, with update for a removed API call.
https://chromium.googlesource.com/skia/+log/d6c04d9a..40ca2087
Change-Id: I938b214fbb79cea6fed99edb5ca7d90a779bb8e8
Reviewed-on: https://pdfium-review.googlesource.com/20930
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/cfx_facecache.cpp')
-rw-r--r-- | core/fxge/cfx_facecache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/fxge/cfx_facecache.cpp b/core/fxge/cfx_facecache.cpp index bc29293c3a..4f373fff89 100644 --- a/core/fxge/cfx_facecache.cpp +++ b/core/fxge/cfx_facecache.cpp @@ -321,8 +321,8 @@ CFX_TypeFace* CFX_FaceCache::GetDeviceCache(const CFX_Font* pFont) { #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ if (!m_pTypeface) { sk_sp<SkFontMgr> customMgr(SkFontMgr_New_Custom_Empty()); - m_pTypeface.reset(customMgr->createFromStream( - new SkMemoryStream(pFont->GetFontData(), pFont->GetSize()))); + m_pTypeface = customMgr->makeFromStream(pdfium::MakeUnique<SkMemoryStream>( + pFont->GetFontData(), pFont->GetSize())); } #endif return m_pTypeface.get(); |