Remove CFX_PrivateData from CPDF_ModuleMgr

core/fxcrt/fx_basic_util.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_ext.h"
 
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
 #include <dirent.h>
 #include <sys/types.h>
 #else
 #include <direct.h>
 #endif
 
 #include <algorithm>
 #include <cctype>
 
 CFX_PrivateData::CFX_PrivateData() {}
 
 CFX_PrivateData::~CFX_PrivateData() {
   ClearAll();
 }
 void FX_PRIVATEDATA::FreeData() {
   if (!m_pData) {
     return;
   }
   if (m_bSelfDestruct) {
-    delete (CFX_DestructObject*)m_pData;
+    delete static_cast<CFX_Deletable*>(m_pData);
   } else if (m_pCallback) {
     m_pCallback(m_pData);
   }
 }
 void CFX_PrivateData::AddData(void* pModuleId,
                               void* pData,
                               PD_CALLBACK_FREEDATA callback,
                               FX_BOOL bSelfDestruct) {
   if (!pModuleId) {
     return;
   }
   FX_PRIVATEDATA* pList = m_DataList.GetData();
   int count = m_DataList.GetSize();
   for (int i = 0; i < count; i++) {
     if (pList[i].m_pModuleId == pModuleId) {
       pList[i].FreeData();
       pList[i].m_pData = pData;
       pList[i].m_pCallback = callback;
       return;
     }
   }
   FX_PRIVATEDATA data = {pModuleId, pData, callback, bSelfDestruct};
   m_DataList.Add(data);
 }
 void CFX_PrivateData::SetPrivateData(void* pModuleId,
                                      void* pData,
                                      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) {
   if (!pModuleId) {
     return FALSE;
   }
   FX_PRIVATEDATA* pList = m_DataList.GetData();
   int count = m_DataList.GetSize();
   for (int i = 0; i < count; i++) {
     if (pList[i].m_pModuleId == pModuleId) {
@@ skipping 317 matching lines @@
     dstShift -= 8;
     result |= *dataPtr++ << dstShift;
   }
   if (dstShift > 0) {
     bitShift = 8 - dstShift;
     bitMask = (1 << dstShift) - 1;
     result |= *dataPtr++ >> bitShift & bitMask;
   }
   return result;
 }