commit 727352ad88ddec1ddeb8502f089eaf370031b32f
author Lei Zhang <thestig@chromium.org> Thu Nov 01 16:57:28 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Nov 01 16:57:28 2018 +0000
tree de2072f431307d6d8930ecc48f8ed45d5eed44bf
parent 9cdf613ce26b3bcdc566ae2f50ddb91ed9061836

Roll third_party/skia/ ffbcc3fad..edc6ea7a9 (1 commit)

https://chromium.googlesource.com/skia.git/+log/ffbcc3fadfa1..edc6ea7a9e1c

Change CFX_FaceCache::GetDeviceCache() to use the new MakeFromStream()
signature.

Created with:
  roll-dep third_party/skia

Change-Id: I9a471485236576696005a7e06c962b611cb53136
Reviewed-on: https://pdfium-review.googlesource.com/c/45011
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Ben Wagner <bungeman@google.com>

DEPS

diff --git a/DEPS b/DEPS
index dd0eb40..0f10989 100644
--- a/DEPS
+++ b/DEPS
@@ -30,7 +30,7 @@
   'jpeg_turbo_revision': '61a2bbaa9aec89cb2c882d87ace6aba9aee49bb9',
   'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783',
   'pdfium_tests_revision': '5a68e87859476eb75d3e068bd406c4921a6be8e2',
-  'skia_revision': 'ffbcc3fadfa1e9718acf591be0989d279c22d266',
+  'skia_revision': 'edc6ea7a9e1ced35a5e3351aaea5003a299381dd',
   'tools_memory_revision': 'f7b00daf4df7f6c469f5fbc68d7f40f6bd15d6e6',
   'trace_event_revision': '211b3ed9d0481b4caddbee1322321b86a483ca1f',
   'v8_revision': 'a4f6a37da361b69c87c9230152d8cfb8ce351428',

core/fxge/cfx_facecache.cpp

diff --git a/core/fxge/cfx_facecache.cpp b/core/fxge/cfx_facecache.cpp
index 7ec8bc3..bb27d3a 100644
--- a/core/fxge/cfx_facecache.cpp
+++ b/core/fxge/cfx_facecache.cpp
@@ -318,7 +318,7 @@
   if (!m_pTypeface) {
     pdfium::span<const uint8_t> span = pFont->GetFontSpan();
     m_pTypeface = SkTypeface::MakeFromStream(
-        new SkMemoryStream(span.data(), span.size()));
+        pdfium::MakeUnique<SkMemoryStream>(span.data(), span.size()));
   }
 #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
   if (!m_pTypeface) {