diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-02 10:36:58 -0800 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-02 19:07:33 +0000 |
| commit | cb5eb3bdb0ed36571d313b38dad59e5bde65f4a7 (patch) | |
| tree | 5e6beeee3f4dffb1a0eaeee6e8a5ec0cc96dc423 /xfa/fgas/font/cfgas_fontmgr.h | |
| parent | 4df55209c2f922f33c2f69fadfff5d30026e89d2 (diff) | |
| download | pdfium-cb5eb3bdb0ed36571d313b38dad59e5bde65f4a7.tar.xz | |
Use std::deque for CFX_FontDescriptors
Change-Id: Ic6edc7740513075c2a738cc8897460af17bb0103
Reviewed-on: https://pdfium-review.googlesource.com/2895
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas/font/cfgas_fontmgr.h')
| -rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h index 1dadfd347e..dffdb8a665 100644 --- a/xfa/fgas/font/cfgas_fontmgr.h +++ b/xfa/fgas/font/cfgas_fontmgr.h @@ -7,6 +7,7 @@ #ifndef XFA_FGAS_FONT_CFGAS_FONTMGR_H_ #define XFA_FGAS_FONT_CFGAS_FONTMGR_H_ +#include <deque> #include <map> #include <memory> #include <set> @@ -70,8 +71,6 @@ struct FX_FONTDESCRIPTOR { FX_FONTSIGNATURE FontSignature; }; -typedef CFX_MassArrayTemplate<FX_FONTDESCRIPTOR> CFX_FontDescriptors; - inline bool operator==(const FX_FONTDESCRIPTOR& left, const FX_FONTDESCRIPTOR& right) { return left.uCharSet == right.uCharSet && @@ -80,7 +79,7 @@ inline bool operator==(const FX_FONTDESCRIPTOR& left, FXSYS_wcscmp(left.wsFontFace, right.wsFontFace) == 0; } -typedef void (*FX_LPEnumAllFonts)(CFX_FontDescriptors& fonts, +typedef void (*FX_LPEnumAllFonts)(std::deque<FX_FONTDESCRIPTOR>* fonts, const FX_WCHAR* pwsFaceName, FX_WCHAR wUnicode); @@ -119,7 +118,7 @@ class CFGAS_FontMgr { FX_WCHAR wUnicode = 0); FX_LPEnumAllFonts m_pEnumerator; - CFX_FontDescriptors m_FontFaces; + std::deque<FX_FONTDESCRIPTOR> m_FontFaces; std::vector<CFX_RetainPtr<CFGAS_GEFont>> m_Fonts; std::map<uint32_t, CFX_RetainPtr<CFGAS_GEFont>> m_CPFonts; std::map<uint32_t, CFX_RetainPtr<CFGAS_GEFont>> m_FamilyFonts; |