Merge to XFA: FX_BOOL combo patch.

core/src/fxge/ge/fx_ge_fontmap.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 <limits>
 
 #include "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxge/fx_freetype.h"
@@ skipping 591 matching lines @@
     const uint8_t* ptr = name;
     FX_BOOL bLocalized = FALSE;
     for (int i = 0; i < name.GetLength(); i ++)
         if (ptr[i] > 0x80) {
             bLocalized = TRUE;
             break;
         }
     if (bLocalized) {
         void* hFont = m_pFontInfo->GetFont(name);
         if (hFont == NULL) {
-            FX_BOOL bExact;
-            hFont = m_pFontInfo->MapFont(0, 0, FXFONT_DEFAULT_CHARSET, 0, name, bExact);
+            int iExact;
+            hFont = m_pFontInfo->MapFont(0, 0, FXFONT_DEFAULT_CHARSET, 0, name, iExact);
             if (hFont == NULL) {
                 return;
             }
         }
         CFX_ByteString new_name = GetPSNameFromTT(hFont);
         if (!new_name.IsEmpty()) {
             new_name.Insert(0, ' ');
             m_InstalledTTFonts.Add(new_name);
         }
         m_pFontInfo->DeleteFont(hFont);
@@ skipping 431 matching lines @@
     }
     weight = weight ? weight : FXFONT_FW_NORMAL;
     int old_weight = weight;
     if (nStyle) {
         weight = nStyle & FX_FONT_STYLE_BoldBold ? 900 : (nStyle & FX_FONT_STYLE_Bold ? FXFONT_FW_BOLD : FXFONT_FW_NORMAL);
     }
     if (nStyle & FX_FONT_STYLE_Italic) {
         bItalic = TRUE;
     }
     FX_BOOL bCJK = FALSE;
-    FX_BOOL bExact = FALSE;
+    int iExact = 0;
     int Charset = FXFONT_ANSI_CHARSET;
     if (WindowCP) {
         Charset = _GetCharsetFromCodePage(WindowCP);
     } else if (iBaseFont == 12 && (flags & FXFONT_SYMBOLIC)) {
         Charset = FXFONT_SYMBOL_CHARSET;
     }
     if (Charset == FXFONT_SHIFTJIS_CHARSET || Charset == FXFONT_GB2312_CHARSET ||
             Charset == FXFONT_HANGEUL_CHARSET || Charset == FXFONT_CHINESEBIG5_CHARSET) {
         bCJK = TRUE;
     }
@@ skipping 60 matching lines @@
             } else {
                 family = g_Base14FontNames[iBaseFont];
             }
             pSubstFont->m_SubstFlags |= FXFONT_SUBST_STANDARD;
         }
     } else {
         if (flags & FXFONT_ITALIC) {
             bItalic = TRUE;
         }
     }
-    bExact = !match.IsEmpty();
-    void* hFont = m_pFontInfo->MapFont(weight, bItalic, Charset, PitchFamily, family, bExact);
-    if (bExact) {
+    iExact = !match.IsEmpty();
+    void* hFont = m_pFontInfo->MapFont(weight, bItalic, Charset, PitchFamily, family, iExact);
+    if (iExact) {
         pSubstFont->m_SubstFlags |= FXFONT_SUBST_EXACT;
     }
     if (hFont == NULL) {
         if (flags & FXFONT_EXACTMATCH) {
             return NULL;
         }
         if (bCJK) {
             if (italic_angle != 0) {
                 bItalic = TRUE;
             } else {
@@ skipping 385 matching lines @@
         pInfo->m_Styles |= FXFONT_BOLD;
     }
     if (style.Find(FX_BSTRC("Italic")) > -1 || style.Find(FX_BSTRC("Oblique")) > -1) {
         pInfo->m_Styles |= FXFONT_ITALIC;
     }
     if (facename.Find(FX_BSTRC("Serif")) > -1) {
         pInfo->m_Styles |= FXFONT_SERIF;
     }
     m_FontList.SetAt(facename, pInfo);
 }
-void* CFX_FolderFontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, FX_BOOL& bExact)
+void* CFX_FolderFontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, int& iExact)
 {
     return NULL;
 }
 void* CFX_FolderFontInfo::MapFontByUnicode(FX_DWORD dwUnicode, int weight, FX_BOOL bItalic, int pitch_family)
 {
     return NULL;
 }
 void* CFX_FolderFontInfo::GetFont(const FX_CHAR* face)
 {
     void* p;
@@ skipping 51 matching lines @@
         return FALSE;
     }
     CFontFaceInfo* pFont = (CFontFaceInfo*)hFont;
     name = pFont->m_FaceName;
     return TRUE;
 }
 FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset)
 {
     return FALSE;
 }