Use FXFONT defines in place of integers.

fpdfsdk/cfx_systemhandler.cpp

 // Copyright 2016 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/cfx_systemhandler.h"
 
+#include <memory>
+
 #include "core/fxge/include/fx_ge.h"
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 
 namespace {
 
 int CharSet2CP(int charset) {
-  if (charset == 128)
+  if (charset == FXFONT_SHIFTJIS_CHARSET)
     return 932;
-  if (charset == 134)
+  if (charset == FXFONT_GB2312_CHARSET)
     return 936;
-  if (charset == 129)
+  if (charset == FXFONT_HANGEUL_CHARSET)
     return 949;
-  if (charset == 136)
+  if (charset == FXFONT_CHINESEBIG5_CHARSET)
     return 950;
   return 0;
 }
 
 }  // namespace
 
 void CFX_SystemHandler::SetCursor(int32_t nCursorType) {
   m_pEnv->FFI_SetCursor(nCursorType);
 }
 
@@ skipping 38 matching lines @@
 
 bool CFX_SystemHandler::IsSelectionImplemented() const {
   if (m_pEnv) {
     FPDF_FORMFILLINFO* pInfo = m_pEnv->GetFormFillInfo();
     if (pInfo && pInfo->FFI_OutputSelectedRect)
       return true;
   }
   return false;
 }
 
-bool CFX_SystemHandler::FindNativeTrueTypeFont(int32_t nCharset,
-                                               CFX_ByteString sFontFaceName) {
+bool CFX_SystemHandler::FindNativeTrueTypeFont(CFX_ByteString sFontFaceName) {
   CFX_FontMgr* pFontMgr = CFX_GEModule::Get()->GetFontMgr();
   if (!pFontMgr)
     return false;
 
   CFX_FontMapper* pFontMapper = pFontMgr->GetBuiltinMapper();
   if (!pFontMapper)
     return false;
 
   if (pFontMapper->m_InstalledTTFonts.empty())
     pFontMapper->LoadInstalledFonts();
 
   for (const auto& font : pFontMapper->m_InstalledTTFonts) {
     if (font.Compare(sFontFaceName.AsStringC()))
       return true;
   }
 
   return false;
 }
 
 CPDF_Font* CFX_SystemHandler::AddNativeTrueTypeFontToPDF(
     CPDF_Document* pDoc,
     CFX_ByteString sFontFaceName,
     uint8_t nCharset) {
   if (!pDoc)
     return nullptr;
 
-  CFX_Font* pFXFont = new CFX_Font();
+  std::unique_ptr<CFX_Font> pFXFont(new CFX_Font);
   pFXFont->LoadSubst(sFontFaceName, TRUE, 0, 0, 0, CharSet2CP(nCharset), FALSE);
-  CPDF_Font* pFont = pDoc->AddFont(pFXFont, nCharset, FALSE);
-  delete pFXFont;
-  return pFont;
+  return pDoc->AddFont(pFXFont.get(), nCharset, FALSE);
 }
 
 int32_t CFX_SystemHandler::SetTimer(int32_t uElapse,
                                     TimerCallback lpTimerFunc) {
   return m_pEnv->FFI_SetTimer(uElapse, lpTimerFunc);
 }
 
 void CFX_SystemHandler::KillTimer(int32_t nID) {
   m_pEnv->FFI_KillTimer(nID);
 }
 
 FX_SYSTEMTIME CFX_SystemHandler::GetLocalTime() {
   return m_pEnv->FFI_GetLocalTime();
 }
 
 bool CFX_SystemHandler::IsSHIFTKeyDown(uint32_t nFlag) const {
   return !!m_pEnv->FFI_IsSHIFTKeyDown(nFlag);
 }
 
 bool CFX_SystemHandler::IsCTRLKeyDown(uint32_t nFlag) const {
   return !!m_pEnv->FFI_IsCTRLKeyDown(nFlag);
 }
 
 bool CFX_SystemHandler::IsALTKeyDown(uint32_t nFlag) const {
   return !!m_pEnv->FFI_IsALTKeyDown(nFlag);
 }