Merge to XFA: FX_BOOL combo patch.

core/include/fxge/fx_font.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 CORE_INCLUDE_FXGE_FX_FONT_H_
 #define CORE_INCLUDE_FXGE_FX_FONT_H_
 
 #include <map>
@@ skipping 318 matching lines @@
     FXFT_Face                   m_FoxitFaces[FOXIT_FACE_COUNT];
     IFX_FontEnumerator*         m_pFontEnumerator;
 };
 class IFX_SystemFontInfo
 {
 public:
     static IFX_SystemFontInfo*  CreateDefault();
     virtual void                Release() = 0;
 
     virtual     FX_BOOL         EnumFontList(CFX_FontMapper* pMapper) = 0;
-    virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, FX_BOOL& bExact) = 0;
+    virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, int& iExact) = 0;
     virtual void*               MapFontByUnicode(FX_DWORD dwUnicode, int weight, FX_BOOL bItalic, int pitch_family)
     {
         return NULL;
     }
     virtual void*               GetFont(const FX_CHAR* face) = 0;
     virtual FX_DWORD    GetFontData(void* hFont, FX_DWORD table, uint8_t* buffer, FX_DWORD size) = 0;
     virtual FX_BOOL             GetFaceName(void* hFont, CFX_ByteString& name) = 0;
     virtual FX_BOOL             GetFontCharset(void* hFont, int& charset) = 0;
     virtual int                 GetFaceIndex(void* hFont)
     {
         return 0;
     }
     virtual void                DeleteFont(void* hFont) = 0;
     virtual void*       RetainFont(void* hFont)
     {
         return NULL;
     }
 protected:
     ~IFX_SystemFontInfo() { }
 };
 class CFX_FolderFontInfo : public IFX_SystemFontInfo
 {
 public:
     CFX_FolderFontInfo();
     virtual ~CFX_FolderFontInfo();
-    void                                AddPath(const CFX_ByteStringC& path);
-    virtual void                Release();
-    virtual     FX_BOOL         EnumFontList(CFX_FontMapper* pMapper);
-    virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, FX_BOOL& bExact);
-    virtual void*               MapFontByUnicode(FX_DWORD dwUnicode, int weight, FX_BOOL bItalic, int pitch_family);
-    virtual void*               GetFont(const FX_CHAR* face);
-    virtual FX_DWORD    GetFontData(void* hFont, FX_DWORD table, uint8_t* buffer, FX_DWORD size);
-    virtual void                DeleteFont(void* hFont);
-    virtual     FX_BOOL         GetFaceName(void* hFont, CFX_ByteString& name);
-    virtual FX_BOOL             GetFontCharset(void* hFont, int& charset);
+
+    void AddPath(const CFX_ByteStringC& path);
+
+    // IFX_SytemFontInfo:
+    void Release() override;
+    FX_BOOL EnumFontList(CFX_FontMapper* pMapper) override;
+    void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family,
+                  const FX_CHAR* face, int& bExact) override;
+    void* MapFontByUnicode(FX_DWORD dwUnicode, int weight, FX_BOOL bItalic,
+                           int pitch_family) override;
+    void* GetFont(const FX_CHAR* face) override;
+    FX_DWORD GetFontData(void* hFont, FX_DWORD table,
+                         uint8_t* buffer, FX_DWORD size) override;
+    void DeleteFont(void* hFont) override;
+    FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) override;
+    FX_BOOL GetFontCharset(void* hFont, int& charset) override;
+
 protected:
     CFX_MapByteStringToPtr      m_FontList;
     CFX_ByteStringArray m_PathList;
     CFX_FontMapper*             m_pMapper;
     void                                ScanPath(CFX_ByteString& path);
     void                                ScanFile(CFX_ByteString& path);
     void                                ReportFace(CFX_ByteString& path, FXSYS_FILE* pFile, FX_DWORD filesize, FX_DWORD offset);
 };
 class CFX_CountedFaceCache
 {
@@ skipping 75 matching lines @@
                    CFX_AffineMatrix* pText_matrix, unsigned short const* text, unsigned long argb);
 class IFX_GSUBTable
 {
 public:
     static IFX_GSUBTable* Create(CFX_Font* pFont);
     virtual ~IFX_GSUBTable() { }
     virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;
 };
 
 #endif  // CORE_INCLUDE_FXGE_FX_FONT_H_