Merge to XFA: Kill CFX_Object.

core/include/fpdfapi/fpdf_pageobj.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_PAGEOBJ_H_
 #define _FPDF_PAGEOBJ_H_
 #ifndef _FPDF_RESOURCE_
 #include "fpdf_resource.h"
@@ skipping 81 matching lines @@
     void                                AppendRect(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top)
     {
         m_pObject->AppendRect(left, bottom, right, top);
     }
 
     FX_BOOL                             IsRect() const
     {
         return m_pObject->IsRect();
     }
 };
-class CPDF_ClipPathData : public CFX_Object
+class CPDF_ClipPathData 
 {
 public:
 
     CPDF_ClipPathData();
 
     CPDF_ClipPathData(const CPDF_ClipPathData&);
 
     ~CPDF_ClipPathData();
 
     void                                SetCount(int path_count, int text_count);
@@ skipping 41 matching lines @@
     CFX_FloatRect               GetClipBox() const;
 
     void                                AppendPath(CPDF_Path path, int type, FX_BOOL bAutoMerge);
 
     void                                DeletePath(int layer_index);
 
     void                                AppendTexts(CPDF_TextObject** pTexts, int count);
 
     void                                Transform(const CFX_AffineMatrix& matrix);
 };
-class CPDF_ColorStateData : public CFX_Object
+class CPDF_ColorStateData 
 {
 public:
 
     CPDF_ColorStateData(): m_FillRGB(0), m_StrokeRGB(0) {}
 
     CPDF_ColorStateData(const CPDF_ColorStateData& src);
 
     void                                Default();
 
     CPDF_Color                  m_FillColor;
@@ skipping 26 matching lines @@
 
     void                                SetStrokePattern(CPDF_Pattern* pattern, FX_FLOAT* pValue, int nValues);
 private:
     void                                SetColor(CPDF_Color& color, FX_DWORD& rgb, CPDF_ColorSpace* pCS, FX_FLOAT* pValue, int nValues);
 };
 typedef CFX_GraphStateData CPDF_GraphStateData;
 class CPDF_GraphState : public CFX_CountRef<CFX_GraphStateData>
 {
 public:
 };
-class CPDF_TextStateData : public CFX_Object
+class CPDF_TextStateData 
 {
 public:
 
     CPDF_TextStateData();
 
     CPDF_TextStateData(const CPDF_TextStateData& src);
 
     ~CPDF_TextStateData();
 
     CPDF_Font*                  m_pFont;
@@ skipping 38 matching lines @@
     FX_FLOAT                    GetFontSizeV() const;
 
     FX_FLOAT                    GetFontSizeH() const;
 
     FX_FLOAT                    GetBaselineAngle() const;
 
     FX_FLOAT                    GetShearAngle() const;
 
 };
 class CPDF_TransferFunc;
-class CPDF_GeneralStateData : public CFX_Object
+class CPDF_GeneralStateData 
 {
 public:
 
     CPDF_GeneralStateData();
 
     CPDF_GeneralStateData(const CPDF_GeneralStateData& src);
     ~CPDF_GeneralStateData();
 
     void                                SetBlendMode(FX_BSTR blend_mode);
 
@@ skipping 48 matching lines @@
     int                                 GetBlendType() const
     {
         return m_pObject ? m_pObject->m_BlendType : FXDIB_BLEND_NORMAL;
     }
 
     int                                 GetAlpha(FX_BOOL bStroke) const
     {
         return m_pObject ? FXSYS_round((bStroke ? m_pObject->m_StrokeAlpha : m_pObject->m_FillAlpha) * 255) : 255;
     }
 };
-class CPDF_ContentMarkItem : public CFX_Object
+class CPDF_ContentMarkItem 
 {
 public:
 
     typedef enum {
         None,
         PropertiesDict,
         DirectDict,
         MCID
     } ParamType;
 
@@ skipping 31 matching lines @@
         m_pParam = param;
     }
 private:
 
     CFX_ByteString              m_MarkName;
 
     ParamType                   m_ParamType;
 
     void*                               m_pParam;
 };
-class CPDF_ContentMarkData : public CFX_Object
+class CPDF_ContentMarkData 
 {
 public:
 
     CPDF_ContentMarkData() { }
 
     CPDF_ContentMarkData(const CPDF_ContentMarkData& src);
 
     inline int                  CountItems() const
     {
         return m_Marks.GetSize();
@@ skipping 25 matching lines @@
     FX_BOOL                             HasMark(FX_BSTR mark) const;
 
     FX_BOOL                             LookupMark(FX_BSTR mark, CPDF_Dictionary*& pDict) const;
 };
 #define PDFPAGE_TEXT            1
 #define PDFPAGE_PATH            2
 #define PDFPAGE_IMAGE           3
 #define PDFPAGE_SHADING         4
 #define PDFPAGE_FORM            5
 #define PDFPAGE_INLINES         6
-class CPDF_GraphicStates : public CFX_Object
+class CPDF_GraphicStates 
 {
 public:
 
     void                                CopyStates(const CPDF_GraphicStates& src);
 
     void                                DefaultStates();
 
     CPDF_ClipPath               m_ClipPath;
 
     CPDF_GraphState             m_GraphState;
@@ skipping 52 matching lines @@
 protected:
 
     virtual void                CopyData(const CPDF_PageObject* pSrcObject) {}
 
     void                                RecalcBBox();
 
     CPDF_PageObject() {}
 
     virtual ~CPDF_PageObject() {}
 };
-struct CPDF_TextObjectItem : public CFX_Object {
+struct CPDF_TextObjectItem  {
 
     FX_DWORD                    m_CharCode;
 
     FX_FLOAT                    m_OriginX;
 
     FX_FLOAT                    m_OriginY;
 };
 class CPDF_TextObject : public CPDF_PageObject
 {
 public:
@@ skipping 193 matching lines @@
     CFX_DIBitmap*               m_pBitmap;
 
     CFX_ArrayTemplate<CFX_AffineMatrix> m_Matrices;
 
     void                                AddMatrix(CFX_AffineMatrix& matrix);
 protected:
     virtual void                Transform(const CFX_AffineMatrix& matrix) {}
     virtual void                CopyData(const CPDF_PageObject* pSrcObjet) {}
 };
 #endif