Merge to XFA: Kill CFX_Object.

xfa/src/fgas/include/fx_fnt.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 _FX_FONT
 #define _FX_FONT
 class IFX_Font;
 class IFX_FontMgr;
@@ skipping 55 matching lines @@
     virtual FX_INT32            GetItalicAngle() const = 0;
     virtual void                        Reset() = 0;
     virtual IFX_Font*           GetSubstFont(FX_INT32 iGlyphIndex) const = 0;
     virtual void*                       GetDevFont() const = 0;
     virtual void                        SetFontProvider(IFX_FontProvider* pProvider) = 0;
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
     virtual void                        SetLogicalFontStyle(FX_DWORD dwLogFontStyle) = 0;
 #endif
 };
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-typedef struct _FX_FONTMATCHPARAMS : public CFX_Object {
+typedef struct _FX_FONTMATCHPARAMS {
     FX_LPCWSTR                          pwsFamily;
     FX_DWORD                            dwFontStyles;
     FX_DWORD                            dwUSB;
     FX_DWORD                            dwMatchFlags;
     FX_WCHAR                            wUnicode;
     FX_WORD                                     wCodePage;
 } FX_FONTMATCHPARAMS, * FX_LPFONTMATCHPARAMS;
 typedef FX_FONTMATCHPARAMS const * FX_LPCFONTMATCHPARAMS;
 typedef struct _FX_FONTSIGNATURE : public CFX_Target {
     FX_DWORD                            fsUsb[4];
@@ skipping 74 matching lines @@
     virtual IFX_Font*           GetFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     virtual IFX_Font*           LoadFont(FX_LPCBYTE pBuffer, FX_INT32 iLength, FX_INT32 iFaceIndex, FX_INT32* pFaceCount = NULL) = 0;
     virtual IFX_Font*           LoadFont(FX_LPCWSTR pszFileName, FX_INT32 iFaceIndex, FX_INT32* pFaceCount = NULL) = 0;
     virtual IFX_Font*           LoadFont(IFX_Stream *pFontStream, FX_INT32 iFaceIndex, FX_INT32* pFaceCount = NULL, FX_BOOL bSaveStream = FALSE) = 0;
 
     virtual void                        ClearFontCache() = 0;
     virtual void                        RemoveFont(IFX_Font *pFont) = 0;
 };
 #endif
 #endif