Merge to XFA: Kill CFX_Object.

core/include/fpdfapi/fpdf_module.h

 // 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
 
 #ifndef _FPDF_MODULE_
 #define _FPDF_MODULE_
 #ifndef _FXCRT_EXTENSION_
 #include "../fxcrt/fx_ext.h"
 #endif
 class CPDF_ModuleMgr;
 class CPDF_PageModuleDef;
 class CPDF_RenderModuleDef;
 class CPDF_SecurityHandler;
 class CCodec_ModuleMgr;
 class CPDF_Dictionary;
 class ICodec_JpegModule;
 class ICodec_JpxModule;
 class ICodec_FaxModule;
 class ICodec_Jbig2Module;
 class ICodec_IccModule;
 class ICodec_FlateModule;
 #define ADDIN_NAME_CJK                  "Eastern Asian Language Support"
 #define ADDIN_NAME_DECODER              "JPEG2000 and JBIG2 Image Decoders"
-class CPDF_ModuleMgr : public CFX_Object
+class CPDF_ModuleMgr 
 {
 public:
 
     static void Create();
 
     static CPDF_ModuleMgr*      Get();
 
     static void Destroy();
 
 
@@ skipping 79 matching lines @@
     CFX_MapByteStringToPtr      m_SecurityHandlerMap;
 
     CFX_PrivateData                     m_privateData;
 };
 class CPDF_Document;
 class CPDF_DocPageData;
 class CPDF_FontGlobals;
 class IPDF_FontMgr;
 class IPDF_FontMapper;
 class CPDF_ColorSpace;
-class CPDF_PageModuleDef : public CFX_Object
+class CPDF_PageModuleDef 
 {
 public:
     virtual ~CPDF_PageModuleDef() {}
 
     virtual CPDF_DocPageData*   CreateDocData(CPDF_Document* pDoc)
     {
         return NULL;
     }
 
     virtual void                                ReleaseDoc(CPDF_Document*) {}
@@ skipping 17 matching lines @@
 class CFX_AffineMatrix;
 class CPDF_RenderOptions;
 class CPDF_Page;
 class CPDF_DocRenderData;
 class CPDF_PageRenderCache;
 class CFX_BitmapDevice;
 class CPDF_Stream;
 class CFX_DIBSource;
 class CPDF_RenderConfig;
 class CPDF_Image;
-class CPDF_RenderModuleDef : public CFX_Object
+class CPDF_RenderModuleDef 
 {
 public:
     virtual ~CPDF_RenderModuleDef() {}
 
     virtual CPDF_DocRenderData* CreateDocData(CPDF_Document* pDoc)
     {
         return NULL;
     }
 
     virtual void        DestroyDocData(CPDF_DocRenderData*) {}
@@ skipping 12 matching lines @@
     virtual void        DestroyPageCache(CPDF_PageRenderCache*) {}
 
     virtual void        NotifyDecoderAvailable() {}
 
     virtual CPDF_RenderConfig* GetConfig()
     {
         return NULL;
     }
 };
 #endif