summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorcaryclark <caryclark@google.com>2016-07-07 07:55:50 -0700
committerCommit bot <commit-bot@chromium.org>2016-07-07 07:55:50 -0700
commit7fb17c0ba0cc551317569baafa44b4785c8f23d9 (patch)
tree16c6c48cd146bc951fef93ed6aa5856649297c57 /core
parent8bdbc88f3416eb074cfc4a609252aa53ef8a7ec3 (diff)
downloadpdfium-7fb17c0ba0cc551317569baafa44b4785c8f23d9.tar.xz
set font cache if null
testing/corpus/fx/path/path_10_jd.pdf sets the document to null. (It can't be read at all by MacOS Preview.) This causes the font cache to also be null. In this case, get the font cache from CFX_GEModule instead. R=dsinclair@chromium.org Review-Url: https://codereview.chromium.org/2128043004
Diffstat (limited to 'core')
-rw-r--r--core/fxge/skia/fx_skia_device.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 222c8466e0..55fe580086 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -896,6 +896,8 @@ FX_BOOL CFX_SkiaDeviceDriver::DrawDeviceText(int nChars,
const CFX_Matrix* pObject2Device,
FX_FLOAT font_size,
uint32_t color) {
+ if (!pCache)
+ pCache = CFX_GEModule::Get()->GetFontCache();
if (m_pCache->DrawText(nChars, pCharPos, pFont, pCache, pObject2Device,
font_size, color, this)) {
return TRUE;