summaryrefslogtreecommitdiff
path: root/core/fxcrt/fx_basic_util.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-05-24 16:20:29 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-24 16:20:29 -0700
commitddffb57cf9763e2612e9f6f5730f334691adb692 (patch)
tree9f7798eb5eb71fb5cb40aadc1da940891c71aa0b /core/fxcrt/fx_basic_util.cpp
parent5aaa9bc9193d74bb188dd1f890140cf38fb06605 (diff)
downloadpdfium-ddffb57cf9763e2612e9f6f5730f334691adb692.tar.xz
Remove CFX_PrivateData from CPDF_ModuleMgr
Its only used to store one object, so replace it with a unique_ptr to a class with a virtual dtor. Rename the prototypical class with virtual dtor from CFX_DestructObject to CFX_Deletable. Rename the fx_basic_module.cpp to cfx_modulemgr.cpp to match the one class in it. Review-Url: https://codereview.chromium.org/2013483003
Diffstat (limited to 'core/fxcrt/fx_basic_util.cpp')
-rw-r--r--core/fxcrt/fx_basic_util.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/fxcrt/fx_basic_util.cpp b/core/fxcrt/fx_basic_util.cpp
index 2d3483e9b3..b073ea8f17 100644
--- a/core/fxcrt/fx_basic_util.cpp
+++ b/core/fxcrt/fx_basic_util.cpp
@@ -27,7 +27,7 @@ void FX_PRIVATEDATA::FreeData() {
return;
}
if (m_bSelfDestruct) {
- delete (CFX_DestructObject*)m_pData;
+ delete static_cast<CFX_Deletable*>(m_pData);
} else if (m_pCallback) {
m_pCallback(m_pData);
}
@@ -57,7 +57,7 @@ void CFX_PrivateData::SetPrivateData(void* pModuleId,
PD_CALLBACK_FREEDATA callback) {
AddData(pModuleId, pData, callback, FALSE);
}
-void CFX_PrivateData::SetPrivateObj(void* pModuleId, CFX_DestructObject* pObj) {
+void CFX_PrivateData::SetPrivateObj(void* pModuleId, CFX_Deletable* pObj) {
AddData(pModuleId, pObj, NULL, TRUE);
}
FX_BOOL CFX_PrivateData::RemovePrivateData(void* pModuleId) {