Merge to XFA: Kill CFX_Object.

core/include/fpdfapi/fpdf_resource.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_RESOURCE_
 #define _FPDF_RESOURCE_
 #ifndef _FPDF_PARSER_
 #include "fpdf_parser.h"
@@ skipping 21 matching lines @@
 class CFX_SubstFont;
 class CFX_Font;
 class CPDF_RenderContext;
 class CPDF_Form;
 class CPDF_ImageObject;
 class CFX_DIBitmap;
 typedef struct FT_FaceRec_* FXFT_Face;
 class CFX_CTTGSUBTable;
 class CPDF_Page;
 
-template <class ObjClass> class CPDF_CountedObject : public CFX_Object
+template <class ObjClass> class CPDF_CountedObject 
 {
 public:
     ObjClass    m_Obj;
     FX_DWORD    m_nCount;
 };
 typedef CPDF_CountedObject<CPDF_Font*>          CPDF_CountedFont;
 typedef CPDF_CountedObject<CPDF_ColorSpace*>    CPDF_CountedColorSpace;
 typedef CPDF_CountedObject<CPDF_Pattern*>       CPDF_CountedPattern;
 typedef CPDF_CountedObject<CPDF_Image*>         CPDF_CountedImage;
 typedef CPDF_CountedObject<CPDF_IccProfile*>    CPDF_CountedICCProfile;
@@ skipping 16 matching lines @@
 #define PDFFONT_SYMBOLIC                4
 #define PDFFONT_SCRIPT                  8
 #define PDFFONT_NONSYMBOLIC             32
 #define PDFFONT_ITALIC                  64
 #define PDFFONT_ALLCAP                  0x10000
 #define PDFFONT_SMALLCAP                0x20000
 #define PDFFONT_FORCEBOLD               0x40000
 #define PDFFONT_USEEXTERNATTR   0x80000
 FX_WCHAR PDF_UnicodeFromAdobeName(const FX_CHAR* name);
 CFX_ByteString PDF_AdobeNameFromUnicode(FX_WCHAR unicode);
-class CPDF_Font : public CFX_Object
+class CPDF_Font 
 {
 public:
 
     static CPDF_Font*           CreateFontF(CPDF_Document* pDoc, CPDF_Dictionary* pFontDict);
 
     static CPDF_Font*           GetStockFont(CPDF_Document* pDoc, FX_BSTR fontname);
 
     virtual ~CPDF_Font();
 
 
@@ skipping 226 matching lines @@
 #define PDFFONT_ENCODING_BUILTIN                0
 #define PDFFONT_ENCODING_WINANSI                1
 #define PDFFONT_ENCODING_MACROMAN               2
 #define PDFFONT_ENCODING_MACEXPERT              3
 #define PDFFONT_ENCODING_STANDARD               4
 #define PDFFONT_ENCODING_ADOBE_SYMBOL   5
 #define PDFFONT_ENCODING_ZAPFDINGBATS   6
 #define PDFFONT_ENCODING_PDFDOC                 7
 #define PDFFONT_ENCODING_MS_SYMBOL              8
 #define PDFFONT_ENCODING_UNICODE                9
-class CPDF_FontEncoding : public CFX_Object
+class CPDF_FontEncoding 
 {
 public:
 
     CPDF_FontEncoding();
 
     CPDF_FontEncoding(int PredefinedEncoding);
 
     void                                        LoadEncoding(CPDF_Object* pEncoding);
 
     FX_BOOL                                     IsIdentical(CPDF_FontEncoding* pAnother) const;
@@ skipping 94 matching lines @@
 };
 class CPDF_TrueTypeFont : public CPDF_SimpleFont
 {
 public:
 
     CPDF_TrueTypeFont();
 protected:
     virtual FX_BOOL                     _Load();
     virtual void                        LoadGlyphMap();
 };
-class CPDF_Type3Char : public CFX_Object
+class CPDF_Type3Char 
 {
 public:
 
     CPDF_Type3Char();
 
     ~CPDF_Type3Char();
 
     FX_BOOL LoadBitmap(CPDF_RenderContext* pContext);
 
     FX_BOOL                                     m_bColored;
@@ skipping 123 matching lines @@
 #define PDFCS_DEVICERGB         2
 #define PDFCS_DEVICECMYK        3
 #define PDFCS_CALGRAY           4
 #define PDFCS_CALRGB            5
 #define PDFCS_LAB               6
 #define PDFCS_ICCBASED          7
 #define PDFCS_SEPARATION        8
 #define PDFCS_DEVICEN           9
 #define PDFCS_INDEXED           10
 #define PDFCS_PATTERN           11
-class CPDF_ColorSpace : public CFX_Object
+
+class CPDF_ColorSpace
 {
 public:
 
     static CPDF_ColorSpace* GetStockCS(int Family);
 
     static CPDF_ColorSpace*     Load(CPDF_Document* pDoc, CPDF_Object* pCSObj);
 
     void                                        ReleaseCS();
 
     int                                         GetBufSize() const;
@@ skipping 74 matching lines @@
     }
 
     int                                         m_Family;
 
     int                                         m_nComponents;
 
     CPDF_Array*                         m_pArray;
 
     FX_DWORD                            m_dwStdConversion;
 };
-class CPDF_Color : public CFX_Object
+class CPDF_Color 
 {
 public:
 
     CPDF_Color() :m_pCS(NULL), m_pBuffer(NULL)
     {
     }
 
     CPDF_Color(int family);
 
     ~CPDF_Color();
@@ skipping 28 matching lines @@
 
     CPDF_ColorSpace*            m_pCS;
 
 protected:
     void        ReleaseBuffer();
     void        ReleaseColorSpace();
     FX_FLOAT*                       m_pBuffer;
 };
 #define PATTERN_TILING          1
 #define PATTERN_SHADING         2
-class CPDF_Pattern : public CFX_Object
+class CPDF_Pattern 
 {
 public:
    
     virtual ~CPDF_Pattern();
     void    SetForceClear(FX_BOOL bForceClear) { m_bForceClear = bForceClear; }
 
     CPDF_Object*                m_pPatternObj;
 
     int                         m_PatternType;
 
@@ skipping 56 matching lines @@
     CPDF_Function*              m_pFunctions[4];
 
     int                                 m_nFuncs;
 protected:
     void        Clear();
 };
 struct CPDF_MeshVertex {
     FX_FLOAT x, y;
     FX_FLOAT r, g, b;
 };
-class CPDF_MeshStream : public CFX_Object
+class CPDF_MeshStream 
 {
 public:
 
     FX_BOOL                             Load(CPDF_Stream* pShadingStream, CPDF_Function** pFuncs, int nFuncs, CPDF_ColorSpace* pCS);
 
     FX_DWORD                    GetFlag();
 
     void                                GetCoords(FX_FLOAT& x, FX_FLOAT& y);
 
     void                                GetColor(FX_FLOAT& r, FX_FLOAT& g, FX_FLOAT& b);
@@ skipping 19 matching lines @@
 {
 public:
     CPDF_ImageSetParam()
         : pMatteColor(NULL)
         , nQuality(80)
     {
     }
     FX_ARGB* pMatteColor;
     FX_INT32 nQuality;
 };
-class CPDF_Image : public CFX_Object
+class CPDF_Image 
 {
 public:
 
     CPDF_Image(CPDF_Document* pDoc);
 
     ~CPDF_Image();
 
     FX_BOOL                                     LoadImageF(CPDF_Stream* pImageStream, FX_BOOL bInline);
 
     void                                        Release();
@@ skipping 91 matching lines @@
     FX_BOOL                                     m_bIsMask;
 
     FX_BOOL                                     m_bInterpolate;
 
     CPDF_Document*                      m_pDocument;
 
     CPDF_Dictionary*            m_pOC;
     CPDF_Dictionary*    InitJPEG(FX_LPBYTE pData, FX_DWORD size);
 };
 #endif