summaryrefslogtreecommitdiff
path: root/xfa/fgas
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-09-14 21:56:59 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-09-14 21:56:59 +0000
commitc6ab97b5b5be7083c4929b7f08b33203a7f932da (patch)
treef7d7baca1425d1a2928abd490ffdd9cf19075d2b /xfa/fgas
parent5091a49b4a0549375a196a6f8c539f25ff48c3e7 (diff)
downloadpdfium-c6ab97b5b5be7083c4929b7f08b33203a7f932da.tar.xz
Use UnownedPtr in CFX_UnicodeEncoding.
Change-Id: I410909be359a5b5bb0c90d42064144771183525e Reviewed-on: https://pdfium-review.googlesource.com/42461 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'xfa/fgas')
-rw-r--r--xfa/fgas/font/cfgas_gefont.cpp2
-rw-r--r--xfa/fgas/font/cfgas_gefont.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fgas/font/cfgas_gefont.cpp b/xfa/fgas/font/cfgas_gefont.cpp
index 0a57f54cdd..1c3d88beab 100644
--- a/xfa/fgas/font/cfgas_gefont.cpp
+++ b/xfa/fgas/font/cfgas_gefont.cpp
@@ -12,7 +12,6 @@
#include "core/fxcrt/fx_codepage.h"
#include "core/fxge/cfx_font.h"
#include "core/fxge/cfx_substfont.h"
-#include "core/fxge/cfx_unicodeencoding.h"
#include "core/fxge/cfx_unicodeencodingex.h"
#include "third_party/base/ptr_util.h"
#include "xfa/fgas/font/fgas_fontutils.h"
@@ -57,6 +56,7 @@ RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont(
CFGAS_GEFont::CFGAS_GEFont(CFGAS_FontMgr* pFontMgr) : m_pFontMgr(pFontMgr) {}
CFGAS_GEFont::~CFGAS_GEFont() {
+ m_pFontEncoding.reset(); // Has an UnownedPtr to |m_pFont|.
if (!m_bExternalFont)
delete m_pFont;
}
diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h
index 2eadd5aaae..407a232595 100644
--- a/xfa/fgas/font/cfgas_gefont.h
+++ b/xfa/fgas/font/cfgas_gefont.h
@@ -18,7 +18,7 @@
#include "xfa/fgas/font/cfgas_fontmgr.h"
#include "xfa/fgas/font/cfgas_pdffontmgr.h"
-class CFX_UnicodeEncoding;
+class CFX_UnicodeEncodingEx;
class CFGAS_GEFont final : public Retainable {
public:
@@ -75,7 +75,7 @@ class CFGAS_GEFont final : public Retainable {
uint32_t m_dwLogFontStyle = 0;
CFX_Font* m_pFont = nullptr;
CFGAS_FontMgr::ObservedPtr const m_pFontMgr;
- std::unique_ptr<CFX_UnicodeEncoding> m_pFontEncoding;
+ std::unique_ptr<CFX_UnicodeEncodingEx> m_pFontEncoding;
std::map<wchar_t, int32_t> m_CharWidthMap;
std::map<wchar_t, FX_RECT> m_BBoxMap;
std::vector<RetainPtr<CFGAS_GEFont>> m_SubstFonts;