diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-12-10 15:39:28 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-12-10 15:39:28 -0800 |
| commit | d2cfdd5c72be670aff556c44aaff53df66b23ea6 (patch) | |
| tree | de7fce67d473f019174e554790b403a069c59eb5 /core/include | |
| parent | 60d909e9d4444b2b8582275624ee97734d331a38 (diff) | |
| download | pdfium-d2cfdd5c72be670aff556c44aaff53df66b23ea6.tar.xz | |
Merge to XFA: Replace several more CFX_MapPtrToPtr with std::set or std::map
Original Review URL: https://codereview.chromium.org/1520643002 .
(cherry picked from commit 7db2a535f163e7ce5995da12161ebd0214f0f75a)
Original Review URL: https://codereview.chromium.org/1511413008 .
(cherry picked from commit 168cfb7ee0f2abbd2bddb7e7d8b430a6d8c6c120)
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1515613006 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfapi/fpdf_objects.h | 5 | ||||
| -rw-r--r-- | core/include/fpdfdoc/fpdf_doc.h | 5 | ||||
| -rw-r--r-- | core/include/fxge/fx_font.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index 143e7d71c2..8522e9be64 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -7,6 +7,8 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_ +#include <set> + #include "core/include/fxcrt/fx_coordinates.h" #include "core/include/fxcrt/fx_system.h" @@ -129,7 +131,8 @@ class CPDF_Object { private: CPDF_Object(const CPDF_Object& src) {} - CPDF_Object* CloneInternal(FX_BOOL bDirect, CFX_MapPtrToPtr* visited) const; + CPDF_Object* CloneInternal(FX_BOOL bDirect, + std::set<FX_DWORD>* visited) const; }; class CPDF_Boolean : public CPDF_Object { public: diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index 75150eb2f6..07f735e21b 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -421,12 +421,9 @@ class CPDF_Annot : public CFX_PrivateData { private: CPDF_Dictionary* const m_pAnnotDict; - CPDF_AnnotList* const m_pList; - const CFX_ByteString m_sSubtype; - - CFX_MapPtrToPtr m_APMap; + std::map<CPDF_Stream*, CPDF_Form*> m_APMap; }; class CPDF_AnnotList { diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index dd0de401ef..356e94e69c 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -505,7 +505,7 @@ class CFX_FaceCache { FXFT_Face const m_Face; std::map<CFX_ByteString, CFX_SizeGlyphCache*> m_SizeMap; - CFX_MapPtrToPtr m_PathMap; + std::map<FX_DWORD, CFX_PathData*> m_PathMap; CFX_DIBitmap* m_pBitmap; }; |