summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorcaryclark <caryclark@google.com>2016-06-08 12:58:40 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-08 12:58:40 -0700
commitbc85eecc6cbac54e4b69fe202f802047d2979bf1 (patch)
tree0790ce5ca79a4b1d6829cac93812486e7a39ebbc /core
parent7d2a8d966643ebc77c1aa0f0c53a0ffd2d681c4c (diff)
downloadpdfium-bc85eecc6cbac54e4b69fe202f802047d2979bf1.tar.xz
update skia
Update Skia to the last revision that passed the Chrome DEPS roll. This will help green the Skia tree so that future changes to Skia that break PDFium can be detected. R=rmistry@google.com,dsinclair@chromium.org Review-Url: https://codereview.chromium.org/2042403004
Diffstat (limited to 'core')
-rw-r--r--core/fxge/ge/fx_ge_text.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index c63b292435..3725f3652b 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -738,8 +738,10 @@ CFX_TypeFace* CFX_FontCache::GetDeviceCache(CFX_Font* pFont) {
CFX_TypeFace* CFX_FaceCache::GetDeviceCache(CFX_Font* pFont) {
if (!m_pTypeface) {
- m_pTypeface = SkTypeface::CreateFromStream(
- new SkMemoryStream(pFont->GetFontData(), pFont->GetSize()));
+ m_pTypeface =
+ SkTypeface::MakeFromStream(
+ new SkMemoryStream(pFont->GetFontData(), pFont->GetSize()))
+ .release();
}
return m_pTypeface;
}