diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-06-19 18:11:07 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-06-19 18:11:07 -0700 |
| commit | 606346f584700bdae0741066f2e6d2481744032c (patch) | |
| tree | 8f6afe79644cc515795af83dc8a06b207afb1bd6 /core/include | |
| parent | 6d8b1c2c7b1cbada20109f70ae971a4192330bb5 (diff) | |
| download | pdfium-606346f584700bdae0741066f2e6d2481744032c.tar.xz | |
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.
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfdoc/fpdf_doc.h | 4 | ||||
| -rw-r--r-- | core/include/fxge/fx_font.h | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index d6341acbfe..57d1790377 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -7,6 +7,8 @@ #ifndef CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_ #define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_ +#include <map> + #include "../fpdfapi/fpdf_parser.h" #include "../fpdfapi/fpdf_render.h" @@ -181,7 +183,7 @@ protected: UsageType m_eUsageType; - CFX_MapPtrTemplate<const CPDF_Dictionary*, void*> m_OCGStates; + std::map<const CPDF_Dictionary*, FX_BOOL> m_OCGStates; }; class CPDF_LWinParam { 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 <map> + #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<FXFT_Face, CFX_CountedFaceCache*> 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<FXFT_Face, CFX_CountedFaceCache*>; + CFX_FTCacheMap m_FTFaceMap; + CFX_FTCacheMap m_ExtFaceMap; }; class CFX_AutoFontCache { |