From 09d33bcd82a82cb55039d41651df13e17d6c3e59 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 19 Aug 2015 09:49:24 -0700 Subject: Merge to XFA: CFX_MapByteStringToPtr considered harmful (combo patch). New manual edits: two unused members deleted, one adapted. fde_csscache.cpp fde_csscache.h fpdfxfa_doc.h fx_ge_fontmap.cpp (cherry picked from commit 1d9dbd53b205b2b4d9e75a7eeb95e80837917ea3) (cherry picked from commit cb4d0ea68308e3c51a6ba9551b393bb2f639afc4) (cherry picked from commit 9cf44c2ed09a8b2ff243eb6dbb72a8cceae1b5ff) (cherry picked from commit 2a2a6aa7f51352fc481e78f6ad9d41f2738bcc48) (cherry picked from commit ce4ffb8183af3fa2bb5133f0f7370a88e064c516) Original Review URL: https://codereview.chromium.org/1297723002 . R=thestig@chromium.org Review URL: https://codereview.chromium.org/1301793002 . --- core/src/fxge/apple/fx_mac_imp.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'core/src/fxge/apple') diff --git a/core/src/fxge/apple/fx_mac_imp.cpp b/core/src/fxge/apple/fx_mac_imp.cpp index e08f6224d8..88a51bd78c 100644 --- a/core/src/fxge/apple/fx_mac_imp.cpp +++ b/core/src/fxge/apple/fx_mac_imp.cpp @@ -65,10 +65,10 @@ void* CFX_MacFontInfo::MapFont(int weight, 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"); } @@ -88,9 +88,10 @@ void* CFX_MacFontInfo::MapFont(int weight, 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() { -- cgit v1.2.3