Use FXFONT defines in place of integers.

xfa/fgas/font/fgas_gefont.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 "xfa/fgas/font/fgas_gefont.h"
 
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fgas/font/fgas_fontutils.h"
@@ skipping 65 matching lines @@
       m_pFont(NULL),
       m_pFontMgr(pFontMgr),
       m_iRefCount(1),
       m_bExtFont(FALSE),
       m_pStream(NULL),
       m_pFileRead(NULL),
       m_pFontEncoding(NULL),
       m_pCharWidthMap(NULL),
       m_pRectArray(NULL),
       m_pBBoxMap(NULL),
-      m_pProvider(NULL),
-      m_wCharSet(0xFFFF) {
+      m_pProvider(NULL) {
 }
 
 CFGAS_GEFont::CFGAS_GEFont(const CFGAS_GEFont& src, uint32_t dwFontStyles)
     :
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
       m_bUseLogFontStyle(FALSE),
       m_dwLogFontStyle(0),
 #endif
       m_pFont(NULL),
       m_pFontMgr(src.m_pFontMgr),
       m_iRefCount(1),
       m_bExtFont(FALSE),
       m_pStream(NULL),
       m_pFileRead(NULL),
       m_pFontEncoding(NULL),
       m_pCharWidthMap(NULL),
       m_pRectArray(NULL),
       m_pBBoxMap(NULL),
-      m_pProvider(NULL),
-      m_wCharSet(0xFFFF) {
+      m_pProvider(NULL) {
   ASSERT(src.m_pFont);
   m_pFont = new CFX_Font;
   m_pFont->LoadClone(src.m_pFont);
   CFX_SubstFont* pSubst = m_pFont->GetSubstFont();
   if (!pSubst) {
     pSubst = new CFX_SubstFont;
     m_pFont->SetSubstFont(pSubst);
   }
   pSubst->m_Weight =
       (dwFontStyles & FX_FONTSTYLE_Bold) ? FXFONT_FW_BOLD : FXFONT_FW_NORMAL;
@@ skipping 64 matching lines @@
     dwFlags |= FXFONT_ITALIC;
   }
   if (dwFontStyles & FX_FONTSTYLE_Bold) {
     dwFlags |= FXFONT_BOLD;
   }
   if (dwFontStyles & FX_FONTSTYLE_ExactMatch) {
     dwFlags |= FXFONT_EXACTMATCH;
   }
   int32_t iWeight =
       (dwFontStyles & FX_FONTSTYLE_Bold) ? FXFONT_FW_BOLD : FXFONT_FW_NORMAL;
-  uint16_t wCharSet = FX_GetCharsetFromCodePage(wCodePage);
-  if (wCharSet == 0xFFFF) {
-    wCharSet = FXSYS_GetACP();
-  }
-  m_wCharSet = wCharSet;
   m_pFont = new CFX_Font;
   if ((dwFlags & FXFONT_ITALIC) && (dwFlags & FXFONT_BOLD)) {
     csFontFamily += ",BoldItalic";
   } else if (dwFlags & FXFONT_BOLD) {
     csFontFamily += ",Bold";
   } else if (dwFlags & FXFONT_ITALIC) {
     csFontFamily += ",Italic";
   }
   m_pFont->LoadSubst(csFontFamily, TRUE, dwFlags, iWeight, 0, wCodePage);
-  FX_BOOL bRet = m_pFont->GetFace() != nullptr;
-  if (bRet) {
+  if (!m_pFont->GetFace())
+    return false;
+  return InitFont();
+}
+
+FX_BOOL CFGAS_GEFont::LoadFontInternal(const uint8_t* pBuffer, int32_t length) {
+  if (m_pFont)
+    return FALSE;
+
+  m_pFont = new CFX_Font;
+  FX_BOOL bRet = m_pFont->LoadEmbedded(pBuffer, length);

[dsinclair, 2016/06/21 20:43:38]

if (!m_pFont->LoadEmbedded(pBuffer, length))
  return FALSE;
return InitFont();

[Lei Zhang, 2016/06/21 20:46:36]

Done.

+  if (bRet)
     bRet = InitFont();
-  }
   return bRet;
 }
 
-FX_BOOL CFGAS_GEFont::LoadFontInternal(const uint8_t* pBuffer, int32_t length) {
-  if (m_pFont) {
-    return FALSE;
-  }
-  m_pFont = new CFX_Font;
-  FX_BOOL bRet = m_pFont->LoadEmbedded(pBuffer, length);
-  if (bRet) {
-    bRet = InitFont();
-  }
-  m_wCharSet = 0xFFFF;
-  return bRet;
-}
-
 FX_BOOL CFGAS_GEFont::LoadFontInternal(IFX_Stream* pFontStream,
                                        FX_BOOL bSaveStream) {
   if (m_pFont || m_pFileRead || !pFontStream || pFontStream->GetLength() < 1) {
     return FALSE;
   }
   if (bSaveStream) {
     m_pStream = pFontStream;
   }
   m_pFileRead = FX_CreateFileRead(pFontStream);
   m_pFont = new CFX_Font;
   FX_BOOL bRet = m_pFont->LoadFile(m_pFileRead);
   if (bRet) {
     bRet = InitFont();
   } else {
     m_pFileRead->Release();
     m_pFileRead = nullptr;
   }
-  m_wCharSet = 0xFFFF;
   return bRet;
 }
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
 FX_BOOL CFGAS_GEFont::LoadFontInternal(CFX_Font* pExtFont) {
   if (m_pFont || !pExtFont) {
     return FALSE;
   }
   m_pFont = pExtFont;
   m_bExtFont = TRUE;
-  m_wCharSet = 0xFFFF;
   return InitFont();
 }
 
 FX_BOOL CFGAS_GEFont::InitFont() {
   if (!m_pFont)
     return FALSE;
   if (!m_pFontEncoding) {
     m_pFontEncoding = FX_CreateFontEncodingEx(m_pFont);
     if (!m_pFontEncoding)
       return FALSE;
   }
   if (!m_pCharWidthMap)
     m_pCharWidthMap = new CFX_WordDiscreteArray(1024);
   if (!m_pRectArray)
     m_pRectArray = new CFX_MassArrayTemplate<CFX_Rect>(16);
   if (!m_pBBoxMap)
     m_pBBoxMap = new CFX_MapPtrToPtr(16);
 
   return TRUE;
 }
+
 CFGAS_GEFont* CFGAS_GEFont::Derive(uint32_t dwFontStyles, uint16_t wCodePage) {
-  if (GetFontStyles() == dwFontStyles) {
+  if (GetFontStyles() == dwFontStyles)
     return Retain();
-  }
   return new CFGAS_GEFont(*this, dwFontStyles);
 }
-uint8_t CFGAS_GEFont::GetCharSet() const {
-  if (m_wCharSet != 0xFFFF) {
-    return (uint8_t)m_wCharSet;
-  }
-  if (!m_pFont->GetSubstFont()) {
-    return FX_CHARSET_Default;
-  }
-  return m_pFont->GetSubstFont()->m_Charset;
-}
+
 void CFGAS_GEFont::GetFamilyName(CFX_WideString& wsFamily) const {
   if (!m_pFont->GetSubstFont() ||
       m_pFont->GetSubstFont()->m_Family.GetLength() == 0) {
     wsFamily = CFX_WideString::FromLocal(m_pFont->GetFamilyName().AsStringC());
   } else {
     wsFamily = CFX_WideString::FromLocal(
         m_pFont->GetSubstFont()->m_Family.AsStringC());
   }
 }
 
@@ skipping 196 matching lines @@
   }
   if (m_pRectArray != NULL) {
     m_pRectArray->RemoveAll();
   }
 }
 CFGAS_GEFont* CFGAS_GEFont::GetSubstFont(int32_t iGlyphIndex) const {
   iGlyphIndex = ((uint32_t)iGlyphIndex) >> 24;
   return iGlyphIndex == 0 ? const_cast<CFGAS_GEFont*>(this)
                           : m_SubstFonts[iGlyphIndex - 1];
 }