Merge to XFA: CFX_MapByteStringToPtr considered harmful (combo patch).

core/src/fxge/apple/fx_mac_imp.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 "../../../include/fxge/fx_ge.h"
 #include "apple_int.h"
 #if _FX_OS_ == _FX_MACOSX_
 static const struct {
@@ skipping 47 matching lines @@
   int iBaseFont;
   for (iBaseFont = 0; iBaseFont < 12; iBaseFont++)
     if (face == CFX_ByteStringC(Base14Substs[iBaseFont].m_pName)) {
       face = Base14Substs[iBaseFont].m_pSubstName;
       iExact = TRUE;
       break;
     }
   if (iBaseFont < 12) {
     return GetFont(face);
   }
-  void* p;
-  if (m_FontList.Lookup(face, p)) {
-    return p;
-  }
+  auto it = m_FontList.find(face);
+  if (it != m_FontList.end())
+    return it->second;
+
   if (charset == FXFONT_ANSI_CHARSET && (pitch_family & FXFONT_FF_FIXEDPITCH)) {
     return GetFont("Courier New");
   }
   if (charset == FXFONT_ANSI_CHARSET || charset == FXFONT_SYMBOL_CHARSET) {
     return NULL;
   }
   switch (charset) {
     case FXFONT_SHIFTJIS_CHARSET:
       GetJapanesePreference(face, weight, pitch_family);
       break;
     case FXFONT_GB2312_CHARSET:
       face = "STSong";
       break;
     case FXFONT_HANGEUL_CHARSET:
       face = "AppleMyungjo";
       break;
     case FXFONT_CHINESEBIG5_CHARSET:
       face = "LiSong Pro Light";
   }
-  if (m_FontList.Lookup(face, p)) {
-    return p;
-  }
+  it = m_FontList.find(face);
+  if (it != m_FontList.end())
+    return it->second;
+
   return NULL;
 }
 IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() {
   CFX_MacFontInfo* pInfo = new CFX_MacFontInfo;
   if (!pInfo) {
     return NULL;
   }
   pInfo->AddPath("~/Library/Fonts");
   pInfo->AddPath("/Library/Fonts");
   pInfo->AddPath("/System/Library/Fonts");
   return pInfo;
 }
 void CFX_GEModule::InitPlatform() {
   m_pPlatformData = new CApplePlatform;
   m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault());
 }
 void CFX_GEModule::DestroyPlatform() {
   delete (CApplePlatform*)m_pPlatformData;
   m_pPlatformData = NULL;
 }
 #endif