summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorcaryclark <caryclark@google.com>2016-07-21 06:12:33 -0700
committerCommit bot <commit-bot@chromium.org>2016-07-21 06:12:33 -0700
commit8b301624917aae9f7b7b26e6d275c9ae9cd80cfe (patch)
tree669bf4613c6f13f1b495159bbb449899f75aad3d /core
parent3b6c7e9669df2545fc3b19d9f03364c1040a5ab0 (diff)
downloadpdfium-8b301624917aae9f7b7b26e6d275c9ae9cd80cfe.tar.xz
Bring pdfium file in sync with chrome, fix mac build
This permits PDFium to build on the Mac with Skia as the backend. It builds on Linux and Windows as well. R=dsinclair@chromium.org,bungeman@google.com Review-Url: https://codereview.chromium.org/1995003002
Diffstat (limited to 'core')
-rw-r--r--core/fxge/ge/fx_ge_font.cpp2
-rw-r--r--core/fxge/ge/fx_ge_text.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/fxge/ge/fx_ge_font.cpp b/core/fxge/ge/fx_ge_font.cpp
index fd6f8a2cf8..bd0bb0e3e5 100644
--- a/core/fxge/ge/fx_ge_font.cpp
+++ b/core/fxge/ge/fx_ge_font.cpp
@@ -118,7 +118,7 @@ CFX_Font::~CFX_Font() {
FX_Free(m_pOwnedStream);
#endif // PDF_ENABLE_XFA
FX_Free(m_pGsubData);
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ && !defined _SKIA_SUPPORT_
ReleasePlatformResource();
#endif
}
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index 1a0c14e0db..db86d65067 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -851,7 +851,7 @@ const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont,
}
#endif
CFX_ByteString FaceGlyphsKey(keygen.m_Key, keygen.m_KeyLen);
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_
+#if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_ || defined _SKIA_SUPPORT_
return LookUpGlyphBitmap(pFont, pMatrix, FaceGlyphsKey, glyph_index,
bFontStyle, dest_width, anti_alias);
#else