Merge to XFA: FX_BOOL combo patch.

core/src/fxge/ge/fx_ge_linux.cpp

 // 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
 
 #include "../../../include/fxge/fx_ge.h"
 #include "../agg/include/fx_agg_driver.h"
 #include "text_int.h"
 
@@ skipping 12 matching lines @@
     {"Helvetica-BoldOblique", "Arial Bold Italic"},
     {"Helvetica-Oblique", "Arial Italic"},
     {"Times-Roman", "Times New Roman"},
     {"Times-Bold", "Times New Roman Bold"},
     {"Times-BoldItalic", "Times New Roman Bold Italic"},
     {"Times-Italic", "Times New Roman Italic"},
 };
 class CFX_LinuxFontInfo : public CFX_FolderFontInfo
 {
 public:
-    virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, FX_BOOL& bExact);
+    void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, int& iExact) override;
     FX_BOOL                             ParseFontCfg();
     void*                               FindFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, FX_BOOL bMatchName);
 };
 #define LINUX_GPNAMESIZE        6
 static const struct {
     const FX_CHAR* NameArr[LINUX_GPNAMESIZE];
 }
 LinuxGpFontList[] = {
     {{"TakaoPGothic", "VL PGothic", "IPAPGothic", "VL Gothic", "Kochi Gothic", "VL Gothic regular"}},
     {{"TakaoGothic", "VL Gothic", "IPAGothic", "Kochi Gothic", NULL, "VL Gothic regular"}},
@@ skipping 26 matching lines @@
         if (face.Find("PMincho") >= 0 || face.Find("\x82\x6f\x96\xbe\x92\xa9") >= 0) {
             return 2;
         }
         return 3;
     }
     if (!(picth_family & FXFONT_FF_ROMAN) && weight > 400) {
         return 0;
     }
     return 2;
 }
-void* CFX_LinuxFontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* cstr_face, FX_BOOL& bExact)
+void* CFX_LinuxFontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* cstr_face, int& iExact)
 {
     CFX_ByteString face = cstr_face;
     int iBaseFont;
     for (iBaseFont = 0; iBaseFont < 12; iBaseFont ++)
         if (face == CFX_ByteStringC(Base14Substs[iBaseFont].m_pName)) {
             face = Base14Substs[iBaseFont].m_pSubstName;
-            bExact = TRUE;
+            iExact = 1;
             break;
         }
     if (iBaseFont < 12) {
         return GetFont(face);
     }
     void* p = NULL;
     FX_BOOL bCJK = TRUE;
     switch (charset) {
         case FXFONT_SHIFTJIS_CHARSET: {
                 int32_t index = GetJapanesePreference(cstr_face, weight, pitch_family);
@@ skipping 127 matching lines @@
     return FALSE;
 }
 void CFX_GEModule::InitPlatform()
 {
     m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault());
 }
 void CFX_GEModule::DestroyPlatform()
 {
 }
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_