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 | |
| 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>
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | core/fxge/cfx_facecache.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -19,7 +19,7 @@ vars = { 'jpeg_turbo_revision': '7260e4d8b8e1e40b17f03fafdf1cd83296900f76', 'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783', 'pdfium_tests_revision': '3d6228da656a3974d72223a702e6804df494703e', - 'skia_revision': 'd6c04d9a05c1b4066c09083a673d7d3cf61a3aa6', + 'skia_revision': '40ca2087ef0752d78fd2e0995471102fe96fe9fe', 'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d', 'trace_event_revision': '0e9a47d74970bee1bbfc063c47215406f8918699', 'v8_revision': 'ff3d8321d52d599a7ce168e20ade02e8ef131d0a', 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(); |