Merge to XFA: Kill CFX_Object.

core/src/fxge/ge/text_int.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 _TEXT_INT_H_
 #define _TEXT_INT_H_
 
 struct _CFX_UniqueKeyGen {
     void                Generate(int count, ...);
     FX_CHAR             m_Key[128];
     int                 m_KeyLen;
 };
-class CFX_SizeGlyphCache : public CFX_Object
+class CFX_SizeGlyphCache 
 {
 public:
     CFX_SizeGlyphCache()
     {
         m_GlyphMap.InitHashTable(253);
     }
     ~CFX_SizeGlyphCache();
     CFX_MapPtrToPtr                     m_GlyphMap;
 };
-class CTTFontDesc : public CFX_Object
+class CTTFontDesc 
 {
 public:
     CTTFontDesc()
     {
         m_Type = 0;
         m_pFontData = NULL;
         m_RefCount = 0;
     }
     ~CTTFontDesc();
     FX_BOOL                     ReleaseFace(FXFT_Face face);
@@ skipping 31 matching lines @@
     {
         return TRUE;
     }
 };
 #define CHARSET_FLAG_ANSI               1
 #define CHARSET_FLAG_SYMBOL             2
 #define CHARSET_FLAG_SHIFTJIS   4
 #define CHARSET_FLAG_BIG5               8
 #define CHARSET_FLAG_GB                 16
 #define CHARSET_FLAG_KOREAN             32
-class CFontFaceInfo : public CFX_Object
+class CFontFaceInfo 
 {
 public:
     CFX_ByteString              m_FilePath;
     CFX_ByteString              m_FaceName;
     FX_DWORD                    m_Styles;
     FX_DWORD                    m_Charsets;
     FX_DWORD                    m_FontOffset;
     FX_DWORD                    m_FileSize;
     CFX_ByteString              m_FontTables;
 };
-class CFontFileFaceInfo : public CFX_Object
+class CFontFileFaceInfo 
 {
 public:
     CFontFileFaceInfo();
     ~CFontFileFaceInfo();
     IFX_FileStream*             m_pFile;
     FXFT_Face                   m_Face;
     CFX_ByteString              m_FaceName;
     FX_DWORD                    m_Charsets;
     FX_DWORD                    m_FileSize;
     FX_DWORD                    m_FontOffset;
@@ skipping 16 matching lines @@
     virtual FX_BOOL                     IsUnicodeCompatible() const;
     virtual FX_DWORD            GlyphFromCharCodeEx(FX_DWORD charcode, int encoding = ENCODING_UNICODE)
     {
         return GlyphFromCharCode(charcode);
     }
 private:
     CFX_Font* m_pFont;
     FX_DWORD m_nEncodingID;
 };
 #endif  // _TEXT_INT_H_