summaryrefslogtreecommitdiff
path: root/xfa/fxfa/app/xfa_ffapp.cpp
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-05-31 05:46:52 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-31 05:46:52 -0700
commit4dce6d4689d464c3a8825a5d6aa790adfc9228ee (patch)
tree5be0b62c28735f57f53994a490581108cfdce829 /xfa/fxfa/app/xfa_ffapp.cpp
parent8b3b3f59930eb29a80b3e83c0c724a50765b21f9 (diff)
downloadpdfium-4dce6d4689d464c3a8825a5d6aa790adfc9228ee.tar.xz
Fix a leak in CXFA_FontMgr.
Review-Url: https://codereview.chromium.org/2024713002
Diffstat (limited to 'xfa/fxfa/app/xfa_ffapp.cpp')
-rw-r--r--xfa/fxfa/app/xfa_ffapp.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp
index 6b7c06dc21..a26e2c99cf 100644
--- a/xfa/fxfa/app/xfa_ffapp.cpp
+++ b/xfa/fxfa/app/xfa_ffapp.cpp
@@ -7,6 +7,7 @@
#include "xfa/fxfa/include/xfa_ffapp.h"
#include <algorithm>
+#include <utility>
#include "xfa/fgas/font/fgas_stdfontmgr.h"
#include "xfa/fwl/core/cfwl_widgetmgr.h"
@@ -131,15 +132,16 @@ CXFA_FFDoc* CXFA_FFApp::CreateDoc(IXFA_DocProvider* pProvider,
return pDoc;
}
-void CXFA_FFApp::SetDefaultFontMgr(CXFA_DefFontMgr* pFontMgr) {
- if (!m_pFontMgr) {
+void CXFA_FFApp::SetDefaultFontMgr(std::unique_ptr<CXFA_DefFontMgr> pFontMgr) {
+ if (!m_pFontMgr)
m_pFontMgr = new CXFA_FontMgr();
- }
- m_pFontMgr->SetDefFontMgr(pFontMgr);
+ m_pFontMgr->SetDefFontMgr(std::move(pFontMgr));
}
+
CXFA_FontMgr* CXFA_FFApp::GetXFAFontMgr() {
return m_pFontMgr;
}
+
IFX_FontMgr* CXFA_FFApp::GetFDEFontMgr() {
if (!m_pFDEFontMgr) {
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_