Kill CFX_Object.

core/include/fpdfapi/fpdf_objects.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_OBJECTS_
 #define _FPDF_OBJECTS_
 #ifndef _FXCRT_EXTENSION_
 #include "../fxcrt/fx_ext.h"
@@ skipping 17 matching lines @@
 #define PDFOBJ_BOOLEAN          1
 #define PDFOBJ_NUMBER           2
 #define PDFOBJ_STRING           3
 #define PDFOBJ_NAME                     4
 #define PDFOBJ_ARRAY            5
 #define PDFOBJ_DICTIONARY       6
 #define PDFOBJ_STREAM           7
 #define PDFOBJ_NULL                     8
 #define PDFOBJ_REFERENCE        9
 typedef IFX_FileStream* (*FPDF_LPFCloneStreamCallback)(CPDF_Stream *pStream, FX_LPVOID pUserData);
-class CPDF_Object : public CFX_Object
+class CPDF_Object 
 {
 public:
 
     int                                         GetType() const
     {
         return m_Type;
     }
 
     FX_DWORD                            GetObjNum() const
     {
@@ skipping 512 matching lines @@
 
     FX_FILESIZE                         m_FileOffset;
 
     CPDF_CryptoHandler*         m_pCryptoHandler;
 
     void                                        InitStream(CPDF_Dictionary* pDict);
     friend class                        CPDF_Object;
     friend class                        CPDF_StreamAcc;
     friend class                        CPDF_AttachmentAcc;
 };
-class CPDF_StreamAcc : public CFX_Object
+class CPDF_StreamAcc 
 {
 public:
 
     CPDF_StreamAcc();
 
     ~CPDF_StreamAcc();
 
     void                                        LoadAllData(const CPDF_Stream* pStream, FX_BOOL bRawAccess = FALSE,
                                         FX_DWORD estimated_size = 0, FX_BOOL bImageAcc = FALSE);
 
@@ skipping 33 matching lines @@
     CFX_ByteString                      m_ImageDecoder;
 
     CPDF_Dictionary*            m_pImageParam;
 
     const CPDF_Stream*          m_pStream;
 
     FX_LPBYTE                           m_pSrcData;
 };
 CFX_DataFilter* FPDF_CreateFilter(FX_BSTR name, const CPDF_Dictionary* pParam, int width = 0, int height = 0);
 #define FPDF_FILTER_BUFFER_SIZE         20480
-class CPDF_StreamFilter : public CFX_Object
+class CPDF_StreamFilter 
 {
 public:
 
     ~CPDF_StreamFilter();
 
     FX_DWORD                    ReadBlock(FX_LPBYTE buffer, FX_DWORD size);
 
     FX_DWORD                    GetSrcPos()
     {
         return m_SrcOffset;
@@ skipping 62 matching lines @@
     {
         return m_RefObjNum == pOther->m_RefObjNum;
     }
 protected:
 
     CPDF_IndirectObjects*       m_pObjList;
 
     FX_DWORD                            m_RefObjNum;
     friend class                        CPDF_Object;
 };
-class CPDF_IndirectObjects : public CFX_Object
+class CPDF_IndirectObjects 
 {
 public:
 
     CPDF_IndirectObjects(IPDF_DocParser* pParser);
 
     ~CPDF_IndirectObjects();
 
     CPDF_Object*                        GetIndirectObject(FX_DWORD objnum, struct PARSE_CONTEXT* pContext = NULL);
 
     int                                         GetIndirectType(FX_DWORD objnum);
@@ skipping 17 matching lines @@
     }
 protected:
 
     CFX_MapPtrToPtr                     m_IndirectObjs;
 
     IPDF_DocParser*                     m_pParser;
 
     FX_DWORD                            m_LastObjNum;
 };
 #endif