Replace more CFX_MapPtrToPtr and remove it.

core/src/fxge/android/fpf_skiafontmgr.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 "core/include/fxcrt/fx_ext.h"
 #include "fx_fpf.h"
 
 #if _FX_OS_ == _FX_ANDROID_
@@ skipping 201 matching lines @@
 }
 static FX_BOOL FPF_SkiaMaybeArabic(const CFX_ByteStringC& bsFacename) {
   CFX_ByteString bsName = bsFacename;
   bsName.MakeLower();
   return bsName.Find("arabic") > -1;
 }
 CFPF_SkiaFontMgr::CFPF_SkiaFontMgr() : m_bLoaded(FALSE), m_FTLibrary(NULL) {}
 CFPF_SkiaFontMgr::~CFPF_SkiaFontMgr() {
   void* pkey = NULL;
   CFPF_SkiaFont* pValue = NULL;
-  FX_POSITION pos = m_FamilyFonts.GetStartPosition();
-  while (pos) {
-    m_FamilyFonts.GetNextAssoc(pos, pkey, (void*&)pValue);
-    if (pValue) {
-      pValue->Release();
-    }
+  for (const auto& pair : m_FamilyFonts) {
+    if (pair.second)
+      pair.second->Release();
   }
-  m_FamilyFonts.RemoveAll();
+  m_FamilyFonts.clear();
   for (int32_t i = m_FontFaces.GetUpperBound(); i >= 0; i--) {
     CFPF_SkiaFontDescriptor* pFont =
         (CFPF_SkiaFontDescriptor*)m_FontFaces.ElementAt(i);
     delete pFont;
   }
   m_FontFaces.RemoveAll();
   if (m_FTLibrary) {
     FXFT_Done_FreeType(m_FTLibrary);
   }
 }
@@ skipping 12 matching lines @@
   m_bLoaded = TRUE;
 }
 void CFPF_SkiaFontMgr::LoadPrivateFont(IFX_FileRead* pFontFile) {}
 void CFPF_SkiaFontMgr::LoadPrivateFont(const CFX_ByteStringC& bsFileName) {}
 void CFPF_SkiaFontMgr::LoadPrivateFont(void* pBuffer, size_t szBuffer) {}
 IFPF_Font* CFPF_SkiaFontMgr::CreateFont(const CFX_ByteStringC& bsFamilyname,
                                         uint8_t uCharset,
                                         FX_DWORD dwStyle,
                                         FX_DWORD dwMatch) {
   FX_DWORD dwHash = FPF_SKIAGetFamilyHash(bsFamilyname, dwStyle, uCharset);
+  auto it = m_FamilyFonts.find(dwHash);
+  if (it != m_FamilyFonts.end() && it->second)
+    return it->second->Retain();
+
   IFPF_Font* pFont = NULL;

[Oliver Chang, 2016/01/20 21:34:24]

nit: I don't think this |pFont| variable is needed at all.

[Tom Sepez, 2016/01/20 22:18:30]

Done.

-  if (m_FamilyFonts.Lookup((void*)(uintptr_t)dwHash, (void*&)pFont)) {
-    if (pFont) {
-      return pFont->Retain();
-    }
-  }
   FX_DWORD dwFaceName = FPF_SKIANormalizeFontName(bsFamilyname);
   FX_DWORD dwSubst = FPF_SkiaGetSubstFont(dwFaceName);
   FX_DWORD dwSubstSans = FPF_SkiaGetSansFont(dwFaceName);
   FX_BOOL bMaybeSymbol = FPF_SkiaMaybeSymbol(bsFamilyname);
   if (uCharset != FXFONT_ARABIC_CHARSET && FPF_SkiaMaybeArabic(bsFamilyname)) {
     uCharset = FXFONT_ARABIC_CHARSET;
   } else if (uCharset == FXFONT_ANSI_CHARSET &&
              (dwMatch & FPF_MATCHFONT_REPLACEANSI)) {
     uCharset = FXFONT_DEFAULT_CHARSET;
   }
@@ skipping 50 matching lines @@
     if (nExpectVal <= nFind) {
       nItem = i;
       break;
     }
   }
   if (nItem > -1) {
     CFPF_SkiaFontDescriptor* pFontDes =
         (CFPF_SkiaFontDescriptor*)m_FontFaces.ElementAt(nItem);
     CFPF_SkiaFont* pFont = new CFPF_SkiaFont;
     if (pFont->InitFont(this, pFontDes, bsFamilyname, dwStyle, uCharset)) {
-      m_FamilyFonts.SetAt((void*)(uintptr_t)dwHash, (void*)pFont);
+      m_FamilyFonts[dwHash] = pFont;
       return pFont->Retain();
     }
     pFont->Release();
   }
   return NULL;
 }
 FXFT_Face CFPF_SkiaFontMgr::GetFontFace(IFX_FileRead* pFileRead,
                                         int32_t iFaceIndex) {
   if (!pFileRead) {
     return NULL;
@@ skipping 173 matching lines @@
   }
   if (pOS2 && (pOS2->ulCodePageRange1 & (1 << 31))) {
     pFontDesc->m_dwStyle |= FXFONT_SYMBOLIC;
   }
   pFontDesc->m_dwCharsets = FPF_SkiaGetFaceCharset(pOS2);
   pFontDesc->m_iFaceIndex = face->face_index;
   pFontDesc->m_iGlyphNum = face->num_glyphs;
 }
 void CFPF_SkiaFontMgr::OutputSystemFonts() {}
 #endif