Use std::map for CFX_GEFont::m_FontMapper

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 87 matching lines @@
       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_FontMapper(16) {
+      m_wCharSet(0xFFFF) {
 }
 
 CFX_GEFont::CFX_GEFont(const CFX_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_FontMapper(16) {
+      m_wCharSet(0xFFFF) {
+  ASSERT(src.m_pFont);
   m_pFont = new CFX_Font;
-  ASSERT(m_pFont != NULL);
-  ASSERT(src.m_pFont != NULL);
   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;
   if (dwFontStyles & FX_FONTSTYLE_Italic) {
     pSubst->m_SubstFlags |= FXFONT_SUBST_ITALIC;
   }
   InitFont();
 }
 
 CFX_GEFont::~CFX_GEFont() {
   for (int32_t i = 0; i < m_SubstFonts.GetSize(); i++)
     m_SubstFonts[i]->Release();
 
   m_SubstFonts.RemoveAll();
-  m_FontMapper.RemoveAll();
+  m_FontMapper.clear();
   if (m_pFileRead)
     m_pFileRead->Release();
 
   if (m_pStream)
     m_pStream->Release();
 
   delete m_pFontEncoding;

[Lei Zhang, 2016/05/20 20:42:21]

BTW, lots of unique_ptr candidates.

[Tom Sepez, 2016/05/20 21:32:15]

Ack, followup someday.

   delete m_pCharWidthMap;
   delete m_pRectArray;
   delete m_pBBoxMap;
   if (!m_bExtFont)
     delete m_pFont;
 }
 
 void CFX_GEFont::Release() {
   if (--m_iRefCount < 1) {
     if (m_pFontMgr != NULL) {
@@ skipping 302 matching lines @@
     return iGlyphIndex;
   }
   const FGAS_FONTUSB* pFontUSB = FGAS_GetUnicodeBitField(wUnicode);
   if (pFontUSB == NULL) {
     return 0xFFFF;
   }
   uint16_t wBitField = pFontUSB->wBitField;
   if (wBitField >= 128) {
     return 0xFFFF;
   }
-  IFX_Font* pFont = NULL;
-  m_FontMapper.Lookup((void*)(uintptr_t)wUnicode, (void*&)pFont);
-  if (pFont != NULL && pFont != (IFX_Font*)this) {
+  auto it = m_FontMapper.find(wUnicode);
+  IFX_Font* pFont = it != m_FontMapper.end() ? it->second : nullptr;
+  if (pFont && pFont != this) {
     iGlyphIndex =
         ((CFX_GEFont*)pFont)->GetGlyphIndex(wUnicode, FALSE, NULL, bCharCode);
     if (iGlyphIndex != 0xFFFF) {
       int32_t i = m_SubstFonts.Find(pFont);
       if (i > -1) {
         iGlyphIndex |= ((i + 1) << 24);
-        if (ppFont != NULL) {
+        if (ppFont)
           *ppFont = pFont;
-        }
         return iGlyphIndex;
       }
     }
   }
-  if (m_pFontMgr != NULL && bRecursive) {
+  if (m_pFontMgr && bRecursive) {
     CFX_WideString wsFamily;
     GetFamilyName(wsFamily);
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
     IFX_Font* pFont = m_pFontMgr->GetDefFontByUnicode(wUnicode, GetFontStyles(),
                                                       wsFamily.c_str());
 #else
     IFX_Font* pFont = m_pFontMgr->GetFontByUnicode(wUnicode, GetFontStyles(),
                                                    wsFamily.c_str());
-    if (NULL == pFont) {
+    if (!pFont)
       pFont = m_pFontMgr->GetFontByUnicode(wUnicode, GetFontStyles(), NULL);
-    }
 #endif
-    if (pFont != NULL) {
-      if (pFont == (IFX_Font*)this) {
+    if (pFont) {
+      if (pFont == this) {
         pFont->Release();
         return 0xFFFF;
       }
-      m_FontMapper.SetAt((void*)(uintptr_t)wUnicode, (void*)pFont);
+      m_FontMapper[wUnicode] = pFont;
       int32_t i = m_SubstFonts.GetSize();
       m_SubstFonts.Add(pFont);
       iGlyphIndex =
           ((CFX_GEFont*)pFont)->GetGlyphIndex(wUnicode, FALSE, NULL, bCharCode);
       if (iGlyphIndex != 0xFFFF) {
         iGlyphIndex |= ((i + 1) << 24);
-        if (ppFont != NULL) {
+        if (ppFont)
           *ppFont = pFont;
-        }
         return iGlyphIndex;
       }
     }
   }
   return 0xFFFF;
 }
 int32_t CFX_GEFont::GetAscent() const {
   return m_pFont->GetAscent();
 }
 int32_t CFX_GEFont::GetDescent() const {
@@ skipping 13 matching lines @@
   }
   if (m_pRectArray != NULL) {
     m_pRectArray->RemoveAll();
   }
 }
 IFX_Font* CFX_GEFont::GetSubstFont(int32_t iGlyphIndex) const {
   iGlyphIndex = ((uint32_t)iGlyphIndex) >> 24;
   return iGlyphIndex == 0 ? const_cast<CFX_GEFont*>(this)
                           : m_SubstFonts[iGlyphIndex - 1];
 }