From 606346f584700bdae0741066f2e6d2481744032c Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 19 Jun 2015 18:11:07 -0700 Subject: Merge to XFA: Replace some CFX_MapPtrTemplates with std::map. There are more CFX_MapPtrTemplate usage on the XFA branch, so it is not removed. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1181593003. (cherry picked from commit e8d3691c82d1be805ffdce3329d00313af7ce0ab) Review URL: https://codereview.chromium.org/1198663004. --- core/include/fxge/fx_font.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'core/include/fxge/fx_font.h') diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 40822936e5..44e578df59 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -7,6 +7,8 @@ #ifndef CORE_INCLUDE_FXGE_FX_FONT_H_ #define CORE_INCLUDE_FXGE_FX_FONT_H_ +#include + #include "../fxcrt/fx_system.h" #include "fx_dib.h" @@ -384,7 +386,7 @@ public: CFX_FaceCache* m_Obj; FX_DWORD m_nCount; }; -typedef CFX_MapPtrTemplate CFX_FTCacheMap; + class CFX_FontCache { public: @@ -394,8 +396,9 @@ public: void FreeCache(FX_BOOL bRelease = FALSE); private: - CFX_FTCacheMap m_FTFaceMap; - CFX_FTCacheMap m_ExtFaceMap; + using CFX_FTCacheMap = std::map; + CFX_FTCacheMap m_FTFaceMap; + CFX_FTCacheMap m_ExtFaceMap; }; class CFX_AutoFontCache { -- cgit v1.2.3