summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-04-25 14:17:33 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-04-25 21:40:50 +0000
commitcf89faf5da79e186ad354b320ea3e562a2956c37 (patch)
tree6fce0cefbc89c7568b206d3f9105b0a35a0611bd /core
parent87d1c1fc1dc4455cb3695ed2df1a5fdf31e870b1 (diff)
downloadpdfium-cf89faf5da79e186ad354b320ea3e562a2956c37.tar.xz
Use unique_ptr for CFX_GEModule::m_pFontCache.
Change-Id: I656e8028001fadd7869a08593f10b0b8e25fe01c Reviewed-on: https://pdfium-review.googlesource.com/4497 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fxge/cfx_gemodule.h2
-rw-r--r--core/fxge/ge/cfx_gemodule.cpp7
2 files changed, 4 insertions, 5 deletions
diff --git a/core/fxge/cfx_gemodule.h b/core/fxge/cfx_gemodule.h
index 587ec89e59..4dfa413437 100644
--- a/core/fxge/cfx_gemodule.h
+++ b/core/fxge/cfx_gemodule.h
@@ -40,7 +40,7 @@ class CFX_GEModule {
void DestroyPlatform();
uint8_t m_GammaValue[256];
- CFX_FontCache* m_pFontCache;
+ std::unique_ptr<CFX_FontCache> m_pFontCache;
std::unique_ptr<CFX_FontMgr> m_pFontMgr;
CCodec_ModuleMgr* m_pCodecModule;
void* m_pPlatformData;
diff --git a/core/fxge/ge/cfx_gemodule.cpp b/core/fxge/ge/cfx_gemodule.cpp
index 790b670e4f..125758b6ad 100644
--- a/core/fxge/ge/cfx_gemodule.cpp
+++ b/core/fxge/ge/cfx_gemodule.cpp
@@ -10,6 +10,7 @@
#include "core/fxge/cfx_fontmgr.h"
#include "core/fxge/ge/cfx_folderfontinfo.h"
#include "core/fxge/ge/fx_text_int.h"
+#include "third_party/base/ptr_util.h"
namespace {
@@ -19,14 +20,12 @@ CFX_GEModule* g_pGEModule = nullptr;
CFX_GEModule::CFX_GEModule()
: m_FTLibrary(nullptr),
- m_pFontCache(nullptr),
m_pFontMgr(new CFX_FontMgr),
m_pCodecModule(nullptr),
m_pPlatformData(nullptr),
m_pUserFontPaths(nullptr) {}
CFX_GEModule::~CFX_GEModule() {
- delete m_pFontCache;
DestroyPlatform();
}
@@ -55,8 +54,8 @@ void CFX_GEModule::Init(const char** userFontPaths,
CFX_FontCache* CFX_GEModule::GetFontCache() {
if (!m_pFontCache)
- m_pFontCache = new CFX_FontCache();
- return m_pFontCache;
+ m_pFontCache = pdfium::MakeUnique<CFX_FontCache>();
+ return m_pFontCache.get();
}
void CFX_GEModule::SetTextGamma(float gammaValue) {