Merge to XFA: FX_BOOL combo patch.

fpdfsdk/src/fpdf_sysfontinfo.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 "../../public/fpdf_sysfontinfo.h"
 #include "../include/fsdk_define.h"
 #include "../include/pdfwindow/PWL_FontMap.h"
 
@@ skipping 11 matching lines @@
 
         virtual FX_BOOL         EnumFontList(CFX_FontMapper* pMapper) override
         {
                 if (m_pInfo->EnumFonts) {
                         m_pInfo->EnumFonts(m_pInfo, pMapper);
                         return TRUE;
                 }
                 return FALSE;
         }
 
-        virtual void*           MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, FX_BOOL& bExact)  override
+        virtual void*           MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, int& iExact)  override
         {
                 if (m_pInfo->MapFont)
-                        return m_pInfo->MapFont(m_pInfo, weight, bItalic, charset, pitch_family, family, &bExact);
+                        return m_pInfo->MapFont(m_pInfo, weight, bItalic, charset, pitch_family, family, &iExact);
                 return NULL;
         }
 
         virtual void*           GetFont(const FX_CHAR* family)  override
         {
                 if (m_pInfo->GetFont)
                         return m_pInfo->GetFont(m_pInfo, family);
                 return NULL;
         }
 
@@ skipping 117 matching lines @@
         pFontInfoExt->GetFaceName = DefaultGetFaceName;
         pFontInfoExt->GetFont = DefaultGetFont;
         pFontInfoExt->GetFontCharset = DefaultGetFontCharset;
         pFontInfoExt->GetFontData = DefaultGetFontData;
         pFontInfoExt->MapFont = DefaultMapFont;
         pFontInfoExt->Release = DefaultRelease;
         pFontInfoExt->version = 1;
         pFontInfoExt->m_pFontInfo = pFontInfo;
         return pFontInfoExt;
 }