Merge to XFA: Kill CFX_Object.

xfa/include/fxgraphics/fx_graphics.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 __H_FX_GRAPHICS__
 #define __H_FX_GRAPHICS__
 #define FX_ERR_Succeeded                                        0
 #define FX_ERR_Indefinite                                       -1
@@ skipping 76 matching lines @@
     FX_HATCHSTYLE_Trellis                                       = 46,
     FX_HATCHSTYLE_Sphere                                        = 47,
     FX_HATCHSTYLE_SmallGrid                                     = 48,
     FX_HATCHSTYLE_SmallCheckerBoard                     = 49,
     FX_HATCHSTYLE_LargeCheckerBoard                     = 50,
     FX_HATCHSTYLE_OutlinedDiamond                       = 51,
     FX_HATCHSTYLE_SolidDiamond                          = 52
 };
 typedef FX_INT32 FX_DeviceCap;
 typedef FX_INT32 FX_FillMode;
-class CFX_Object;
 class CFX_RenderDevice;
 class CFX_GraphStateData;
 class CFX_Matrix;
 class CFX_DIBSource;
 class CFX_DIBitmap;
 class CFX_Font;
 class CFX_WideString;
 class IFX_FileRead;
 class CFX_PathGenerator;
 class CAGG_Graphics;
 class CFX_Graphics;
 class CFX_Color;
 class CFX_Path;
 class CFX_Pattern;
 class CFX_Shading;
-class CFX_Graphics : public CFX_Object
+class CFX_Graphics
 {
 public:
 
 
     CFX_Graphics();
 
     FX_ERR Create(CFX_RenderDevice * renderDevice, FX_BOOL isAntialiasing = TRUE);
 
     FX_ERR Create(FX_INT32         width,
                   FX_INT32         height,
@@ skipping 164 matching lines @@
     FX_ERR FillPathWithShading(CFX_Path *       path,
                                FX_FillMode      fillMode,
                                CFX_Matrix *     matrix);
     FX_ERR SetDIBitsWithMatrix(CFX_DIBSource * source, CFX_Matrix * matrix);
     FX_ERR CalcTextInfo(const CFX_WideString & text, FX_DWORD * charCodes, FXTEXT_CHARPOS * charPos, CFX_RectF & rect);
 
 
 protected:
     FX_INT32            _type;
 private:
-    struct TInfo : public CFX_Object {
+    struct TInfo {
         CFX_GraphStateData      _graphState;
         FX_BOOL                         _isAntialiasing;
         FX_StrokeAlignment      _strokeAlignment;
         CFX_Matrix                      _CTM;
         FX_BOOL                         _isActOnDash;
         CFX_Color *                     _strokeColor;
         CFX_Color *                     _fillColor;
         CFX_Font *                      _font;
         FX_FLOAT                        _fontSize;
         FX_FLOAT                        _fontHScale;
         FX_FLOAT                        _fontSpacing;
     } _info;
     CFX_RenderDevice *  _renderDevice;
     CFX_PtrArray                _infoStack;
     CAGG_Graphics *     _aggGraphics;
     friend class CAGG_Graphics;
 
 };
-class CFX_Path : public CFX_Object
+class CFX_Path
 {
 public:
 
 
     CFX_Path();
 
     FX_ERR Create();
 
     virtual ~CFX_Path();
 
@@ skipping 53 matching lines @@
     FX_ERR AddSubpath(CFX_Path * path);
 
     FX_ERR Clear();
 
     FX_BOOL IsEmpty();
 
     CFX_PathData * GetPathData();
 private:
     CFX_PathGenerator * _generator;
 };
-class CFX_Color : public CFX_Object
+class CFX_Color
 {
 public:
 
     CFX_Color();
 
     CFX_Color(const FX_ARGB argb);
 
 
     CFX_Color(CFX_Pattern * pattern, const FX_ARGB argb = 0x0);
 
@@ skipping 17 matching lines @@
     union {
         struct {
             FX_ARGB                     _argb;
             CFX_Pattern *       _pattern;
         };
         CFX_Shading *           _shading;
     };
 
     friend class CFX_Graphics;
 };
-class CFX_Pattern : public CFX_Object
+class CFX_Pattern
 {
 public:
 
 
     CFX_Pattern();
 
     FX_ERR Create(CFX_DIBitmap * bitmap,
                   const FX_FLOAT xStep,
                   const FX_FLOAT yStep,
                   CFX_Matrix *   matrix = NULL);
@@ skipping 21 matching lines @@
             FX_FLOAT            _y1Step;
         };
         struct {
             FX_HatchStyle       _hatchStyle;
             FX_ARGB                     _foreArgb;
             FX_ARGB                     _backArgb;
         };
     };
     friend class CFX_Graphics;
 };
-class CFX_Shading : public CFX_Object
+class CFX_Shading
 {
 public:
 
 
     CFX_Shading();
 
     FX_ERR CreateAxial(const CFX_PointF & beginPoint,
                        const CFX_PointF & endPoint,
                        FX_BOOL                    isExtendedBegin,
                        FX_BOOL                    isExtendedEnd,
@@ skipping 20 matching lines @@
     FX_FLOAT    _beginRadius;
     FX_FLOAT    _endRadius;
     FX_BOOL             _isExtendedBegin;
     FX_BOOL             _isExtendedEnd;
     FX_ARGB             _beginArgb;
     FX_ARGB             _endArgb;
     FX_ARGB             _argbArray[FX_SHADING_Steps];
     friend class CFX_Graphics;
 };
 #endif