diff options
author | Lei Zhang <thestig@chromium.org> | 2015-06-10 23:26:11 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-06-10 23:26:11 -0700 |
commit | 05f11bcf48a630b53cac603538bb75f21ad4231d (patch) | |
tree | 550d01f343bca4b234969cd11f8d00a463535273 /core/src/fpdfapi/fpdf_page/pageint.h | |
parent | d0d80adf70030470541d5957f068edf8233b21e8 (diff) | |
download | pdfium-05f11bcf48a630b53cac603538bb75f21ad4231d.tar.xz |
Merge to XFA: Convert CPDF_FontFileMap to std::map.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1144333008.
(cherry picked from commit f726c92cb2cf5739fd5b21e825e5bf510040c62f)
Review URL: https://codereview.chromium.org/1180653004.
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/pageint.h')
-rw-r--r-- | core/src/fpdfapi/fpdf_page/pageint.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 3ce976d8fe..d8c83a2638 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -352,27 +352,29 @@ class CPDF_DocPageData CPDF_CountedColorSpace* FindColorSpacePtr(CPDF_Object* pCSObj) const;
CPDF_CountedPattern* FindPatternPtr(CPDF_Object* pPatternObj) const; - CPDF_Document* m_pPDFDoc; - CFX_MapByteStringToPtr m_HashProfileMap; - CPDF_FontFileMap m_FontFileMap; - FX_BOOL m_bForceClear; - private: using CPDF_CountedFont = CPDF_CountedObject<CPDF_Font*>; using CPDF_CountedIccProfile = CPDF_CountedObject<CPDF_IccProfile*>; using CPDF_CountedImage = CPDF_CountedObject<CPDF_Image*>; + using CPDF_CountedStreamAcc = CPDF_CountedObject<CPDF_StreamAcc*>; using CPDF_ColorSpaceMap = std::map<CPDF_Object*, CPDF_CountedColorSpace*>; + using CPDF_FontFileMap = std::map<CPDF_Stream*, CPDF_CountedStreamAcc*>; using CPDF_FontMap = std::map<CPDF_Dictionary*, CPDF_CountedFont*>; using CPDF_IccProfileMap = std::map<CPDF_Stream*, CPDF_CountedIccProfile*>; using CPDF_ImageMap = std::map<FX_DWORD, CPDF_CountedImage*>; using CPDF_PatternMap = std::map<CPDF_Object*, CPDF_CountedPattern*>; - CPDF_ColorSpaceMap m_ColorSpaceMap; - CPDF_FontMap m_FontMap; - CPDF_IccProfileMap m_IccProfileMap; - CPDF_ImageMap m_ImageMap; - CPDF_PatternMap m_PatternMap; + CPDF_Document* const m_pPDFDoc; + CFX_MapByteStringToPtr m_HashProfileMap; + FX_BOOL m_bForceClear; + + CPDF_ColorSpaceMap m_ColorSpaceMap; + CPDF_FontFileMap m_FontFileMap; + CPDF_FontMap m_FontMap; + CPDF_IccProfileMap m_IccProfileMap; + CPDF_ImageMap m_ImageMap; + CPDF_PatternMap m_PatternMap; }; class CPDF_Function |