Use FXFONT defines in place of integers.

fpdfsdk/pdfwindow/PWL_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 "fpdfsdk/pdfwindow/PWL_FontMap.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h"
@@ skipping 263 matching lines @@
 
   return "";
 }
 
 CFX_ByteString CPWL_FontMap::GetNativeFont(int32_t nCharset) {
   if (nCharset == DEFAULT_CHARSET)
     nCharset = GetNativeCharset();
 
   CFX_ByteString sFontName = GetDefaultFontByCharset(nCharset);
   if (m_pSystemHandler) {
-    if (m_pSystemHandler->FindNativeTrueTypeFont(nCharset, sFontName))
+    if (m_pSystemHandler->FindNativeTrueTypeFont(sFontName))
       return sFontName;
 
-    sFontName = "";
+    sFontName.clear();
   }
   return sFontName;
 }
 
 CPDF_Font* CPWL_FontMap::AddFontToDocument(CPDF_Document* pDoc,
                                            CFX_ByteString& sFontName,
                                            uint8_t nCharset) {
   if (IsStandardFont(sFontName))
     return AddStandardFont(pDoc, sFontName);
 
@@ skipping 132 matching lines @@
   int i = 0;
   while (defaultTTFMap[i].charset != -1) {
     if (nCharset == defaultTTFMap[i].charset)
       return defaultTTFMap[i].fontname;
     ++i;
   }
   return "";
 }
 
 int32_t CPWL_FontMap::CharSetFromUnicode(uint16_t word, int32_t nOldCharset) {
-  if (m_pSystemHandler && (-1 != m_pSystemHandler->GetCharSet()))
-    return m_pSystemHandler->GetCharSet();
   // to avoid CJK Font to show ASCII
   if (word < 0x7F)
     return ANSI_CHARSET;
   // follow the old charset
   if (nOldCharset != DEFAULT_CHARSET)
     return nOldCharset;
 
   // find new charset
   if ((word >= 0x4E00 && word <= 0x9FA5) ||
       (word >= 0xE7C7 && word <= 0xE7F3) ||
@@ skipping 41 matching lines @@
 
 CPWL_DocFontMap::CPWL_DocFontMap(CFX_SystemHandler* pSystemHandler,
                                  CPDF_Document* pAttachedDoc)
     : CPWL_FontMap(pSystemHandler), m_pAttachedDoc(pAttachedDoc) {}
 
 CPWL_DocFontMap::~CPWL_DocFontMap() {}
 
 CPDF_Document* CPWL_DocFontMap::GetDocument() {
   return m_pAttachedDoc;
 }