Merge to XFA: Kill CFX_Object.

core/include/fpdfapi/fpdf_serial.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_SERIAL_
 #define _FPDF_SERIAL_
 #ifndef _FPDF_PAGE_
 #include "fpdf_page.h"
@@ skipping 95 matching lines @@
     CPDF_GeneralState   m_LastGeneralState;
 
     CPDF_PageObjects*   m_pCurPage;
 
     CFX_MapPtrToPtr             m_ObjectMap;
 };
 #define FPDFCREATE_INCREMENTAL          1
 #define FPDFCREATE_NO_ORIGINAL          2
 #define FPDFCREATE_PROGRESSIVE          4
 #define FPDFCREATE_OBJECTSTREAM         8
-class CPDF_Creator : public CFX_Object
+class CPDF_Creator 
 {
 public:
 
     CPDF_Creator(CPDF_Document* pDoc);
 
     ~CPDF_Creator();
 
     void                                RemoveSecurity();
 
     FX_BOOL                             Create(FX_LPCWSTR filename, FX_DWORD flags = 0);
@@ skipping 69 matching lines @@
     CFX_DWordListArray          m_ObjectSize;
     CFX_DWordArray              m_NewObjNumArray;
 
     CPDF_Array*                 m_pIDArray;
 
     FX_INT32                    m_FileVersion;
     friend class CPDF_ObjectStream;
     friend class CPDF_XRefStream;
 };
 #endif