summaryrefslogtreecommitdiff
path: root/core/fxcrt/include
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/include
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/include')
-rw-r--r--core/fxcrt/include/fx_basic.h2
-rw-r--r--core/fxcrt/include/fx_memory.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/fxcrt/include/fx_basic.h b/core/fxcrt/include/fx_basic.h
index 848429e8f3..0f517e7217 100644
--- a/core/fxcrt/include/fx_basic.h
+++ b/core/fxcrt/include/fx_basic.h
@@ -639,7 +639,7 @@ class CFX_PrivateData {
void SetPrivateData(void* module_id,
void* pData,
PD_CALLBACK_FREEDATA callback);
- void SetPrivateObj(void* module_id, CFX_DestructObject* pObj);
+ void SetPrivateObj(void* module_id, CFX_Deletable* pObj);
void* GetPrivateData(void* module_id);
FX_BOOL LookupPrivateData(void* module_id, void*& pData) const {
diff --git a/core/fxcrt/include/fx_memory.h b/core/fxcrt/include/fx_memory.h
index 2614016550..3048897d76 100644
--- a/core/fxcrt/include/fx_memory.h
+++ b/core/fxcrt/include/fx_memory.h
@@ -100,9 +100,9 @@ struct ReleaseDeleter {
inline void operator()(T* ptr) const { ptr->Release(); }
};
-class CFX_DestructObject {
+class CFX_Deletable {
public:
- virtual ~CFX_DestructObject() {}
+ virtual ~CFX_Deletable() {}
};
#endif // __cplusplus