Remove CFX_PrivateData from CPDF_ModuleMgr

core/fxcodec/codec/fx_codec_jbig.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 <list>
 
 #include "core/fxcodec/codec/codec_int.h"
 #include "core/fxcodec/include/fx_codec.h"
@@ skipping 12 matching lines @@
   uint8_t* m_dest_buf;
   uint32_t m_dest_pitch;
   IFX_Pause* m_pPause;
   CJBig2_Context* m_pContext;
   CJBig2_Image* m_dest_image;
 };
 
 }  // namespace
 
 // Holds per-document JBig2 related data.
-class JBig2DocumentContext : public CFX_DestructObject {
+class JBig2DocumentContext : public CFX_Deletable {
  public:
   std::list<CJBig2_CachePair>* GetSymbolDictCache() {
     return &m_SymbolDictCache;
   }
 
   ~JBig2DocumentContext() override {
     for (auto it : m_SymbolDictCache) {
       delete it.second;
     }
   }
 
  private:
   std::list<CJBig2_CachePair> m_SymbolDictCache;
 };
 
 JBig2DocumentContext* GetJBig2DocumentContext(CCodec_Jbig2Module* pModule,
                                               CFX_PrivateData* pPrivateData) {
   void* pModulePrivateData = pPrivateData->GetPrivateData(pModule);
   if (pModulePrivateData) {
-    CFX_DestructObject* pDestructObject =
-        reinterpret_cast<CFX_DestructObject*>(pModulePrivateData);
+    CFX_Deletable* pDestructObject =

[Lei Zhang, 2016/05/24 21:34:58]

pDeletableObject

[Tom Sepez, 2016/05/24 21:56:55]

Done.

+        reinterpret_cast<CFX_Deletable*>(pModulePrivateData);
     return static_cast<JBig2DocumentContext*>(pDestructObject);
   }
   JBig2DocumentContext* pJBig2DocumentContext = new JBig2DocumentContext();
   pPrivateData->SetPrivateObj(pModule, pJBig2DocumentContext);
   return pJBig2DocumentContext;
 }
 
 CCodec_Jbig2Context::CCodec_Jbig2Context() {
   FXSYS_memset(this, 0, sizeof(CCodec_Jbig2Context));
 }
@@ skipping 72 matching lines @@
     return FXCODEC_STATUS_ERROR;
   }
   int dword_size =
       m_pJbig2Context->m_height * m_pJbig2Context->m_dest_pitch / 4;
   uint32_t* dword_buf = (uint32_t*)m_pJbig2Context->m_dest_buf;
   for (int i = 0; i < dword_size; i++) {
     dword_buf[i] = ~dword_buf[i];
   }
   return FXCODEC_STATUS_DECODE_FINISH;
 }