Merge to XFA: Kill CFX_Object.

core/include/fpdfapi/fpdf_page.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_PAGE_
 #define _FPDF_PAGE_
 #ifndef _FPDF_PARSER_
 #include "fpdf_parser.h"
@@ skipping 14 matching lines @@
 class CPDF_AllStates;
 class CPDF_ContentParser;
 class CPDF_StreamContentParser;
 class CPDF_ResourceNaming;
 #define PDFTRANS_GROUP                  0x0100
 #define PDFTRANS_ISOLATED               0x0200
 #define PDFTRANS_KNOCKOUT               0x0400
 #define PDF_CONTENT_NOT_PARSED  0
 #define PDF_CONTENT_PARSING             1
 #define PDF_CONTENT_PARSED              2
-class CPDF_PageObjects : public CFX_Object
+class CPDF_PageObjects 
 {
 public:
 
     CPDF_PageObjects(FX_BOOL bReleaseMembers = TRUE);
 
     ~CPDF_PageObjects();
 
 
 
 
@@ skipping 146 matching lines @@
     friend class                CPDF_ContentParser;
 
     FX_FLOAT                    m_PageWidth;
 
     FX_FLOAT                    m_PageHeight;
 
     CFX_AffineMatrix    m_PageMatrix;
 
     CPDF_PageRenderCache*       m_pPageRender;
 };
-class CPDF_ParseOptions : public CFX_Object
+class CPDF_ParseOptions 
 {
 public:
 
     CPDF_ParseOptions();
 
     FX_BOOL                             m_bTextOnly;
 
     FX_BOOL                             m_bMarkedContent;
 
     FX_BOOL                             m_bSeparateForm;
 
     FX_BOOL                             m_bDecodeInlineImage;
 };
 class CPDF_Form : public CPDF_PageObjects
 {
 public:
 
     CPDF_Form(CPDF_Document* pDocument, CPDF_Dictionary* pPageResources, CPDF_Stream* pFormStream, CPDF_Dictionary* pParentResources = NULL);
 
     ~CPDF_Form();
 
     void                                StartParse(CPDF_AllStates* pGraphicStates,  CFX_AffineMatrix* pParentMatrix,
                                    CPDF_Type3Char* pType3Char, CPDF_ParseOptions* pOptions, int level = 0);
 
     void                                ParseContent(CPDF_AllStates* pGraphicStates, CFX_AffineMatrix* pParentMatrix,
                                      CPDF_Type3Char* pType3Char, CPDF_ParseOptions* pOptions, int level = 0);
 
     CPDF_Form*                  Clone() const;
 };
-class CPDF_PageContentGenerate : public CFX_Object
+class CPDF_PageContentGenerate 
 {
 public:
     CPDF_PageContentGenerate(CPDF_Page* pPage);
     ~CPDF_PageContentGenerate();
     FX_BOOL InsertPageObject(CPDF_PageObject* pPageObject);
     void GenerateContent();
     void TransformContent(CFX_Matrix& matrix);
 protected:
     void            ProcessImage(CFX_ByteTextBuf& buf, CPDF_ImageObject* pImageObj);
     void            ProcessForm(CFX_ByteTextBuf& buf, FX_LPCBYTE data, FX_DWORD size, CFX_Matrix& matrix);
     CFX_ByteString  RealizeResource(CPDF_Object* pResourceObj, const FX_CHAR* szType);
 private:
     CPDF_Page*      m_pPage;
     CPDF_Document*  m_pDocument;
     CFX_PtrArray    m_pageObjects;
 };
 #endif