Merge to XFA: Kill CFX_Object.

core/include/fxcrt/fx_coordinates.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 _FXCRT_COORDINATES_
 #define _FXCRT_COORDINATES_
 
 #include "fx_basic.h"
 
 template<class baseType> class CFX_PSVTemplate;
 template<class baseType> class CFX_VTemplate;
 template<class baseType> class CFX_PRLTemplate;
 template<class baseType> class CFX_RTemplate;
 template<class baseType> class CFX_ETemplate;
 template<class baseType> class CFX_ATemplate;
 template<class baseType> class CFX_RRTemplate;
 class CFX_Matrix;
 template<class baseType>
-class CFX_PSVTemplate : public CFX_Object
+class CFX_PSVTemplate 
 {
 public:
     typedef CFX_PSVTemplate<baseType>   FXT_PSV;
     typedef CFX_PSVTemplate<baseType>   FXT_POINT;
     typedef CFX_PSVTemplate<baseType>   FXT_SIZE;
     void                Set(baseType x, baseType y)
     {
         FXT_PSV::x = x, FXT_PSV::y = y;
     }
     void                Set(const FXT_PSV &psv)
@@ skipping 191 matching lines @@
     {
         CFX_VTemplate vx;
         vx.Set(1, 0);
         FX_FLOAT fSlope = ArcCosine(v, vx);
         return v.y < 0 ? -fSlope : fSlope;
     }
 };
 typedef CFX_VTemplate<FX_INT32> CFX_Vector;
 typedef CFX_VTemplate<FX_FLOAT> CFX_VectorF;
 template<class baseType>
-class CFX_RTemplate: public CFX_Object
+class CFX_RTemplate
 {
 public:
     typedef CFX_PSVTemplate<baseType>   FXT_POINT;
     typedef CFX_PSVTemplate<baseType>   FXT_SIZE;
     typedef CFX_VTemplate<baseType>             FXT_VECTOR;
     typedef CFX_PRLTemplate<baseType>   FXT_PARAL;
     typedef CFX_RTemplate<baseType>             FXT_RECT;
     void                Set(baseType left, baseType top, baseType width, baseType height)
     {
         FXT_RECT::left = left, FXT_RECT::top = top, FXT_RECT::width = width, FXT_RECT::height = height;
@@ skipping 359 matching lines @@
 struct FX_SMALL_RECT {
 
     FX_SHORT    Left;
 
     FX_SHORT    Top;
 
     FX_SHORT    Right;
 
     FX_SHORT    Bottom;
 };
-class CFX_FloatRect : public CFX_Object
+class CFX_FloatRect 
 {
 public:
 
     CFX_FloatRect()
     {
         left = right = bottom = top = 0;
     }
 
     CFX_FloatRect(FX_FLOAT left1, FX_FLOAT bottom1, FX_FLOAT right1, FX_FLOAT top1)
     {
@@ skipping 118 matching lines @@
     static CFX_FloatRect        GetBBox(const CFX_FloatPoint* pPoints, int nPoints);
 
     FX_FLOAT                    left;
 
     FX_FLOAT                    right;
 
     FX_FLOAT                    bottom;
 
     FX_FLOAT                    top;
 };
-class CFX_Matrix : public CFX_Object
+class CFX_Matrix 
 {
 public:
 
     CFX_Matrix()
     {
         a = d = 1;
         b = c = e = f = 0;
     }
 
     CFX_Matrix(FX_FLOAT a1, FX_FLOAT b1, FX_FLOAT c1, FX_FLOAT d1, FX_FLOAT e1, FX_FLOAT f1)
@@ skipping 134 matching lines @@
 public:
     FX_FLOAT a;
     FX_FLOAT b;
     FX_FLOAT c;
     FX_FLOAT d;
     FX_FLOAT e;
     FX_FLOAT f;
 };
 #define CFX_AffineMatrix        CFX_Matrix
 #endif