diff options
| author | tsepez <tsepez@chromium.org> | 2017-01-05 12:18:41 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2017-01-05 12:18:41 -0800 |
| commit | 6bb3b894488fd6f38c096b708980a9f08286ac5c (patch) | |
| tree | 2360efbf1aa5f2c452ca350382483d1c6b693f23 /xfa/fxfa/parser/xfa_object.h | |
| parent | 48f776f7e801d719683b251dc21ee8c0e3250d90 (diff) | |
| download | pdfium-6bb3b894488fd6f38c096b708980a9f08286ac5c.tar.xz | |
Remove CFX_MapPtrToPtr from xfa/fxfa.
Review-Url: https://codereview.chromium.org/2612923002
Diffstat (limited to 'xfa/fxfa/parser/xfa_object.h')
| -rw-r--r-- | xfa/fxfa/parser/xfa_object.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h index 93f4e0145d..8be19ec2e1 100644 --- a/xfa/fxfa/parser/xfa_object.h +++ b/xfa/fxfa/parser/xfa_object.h @@ -7,6 +7,7 @@ #ifndef XFA_FXFA_PARSER_XFA_OBJECT_H_ #define XFA_FXFA_PARSER_XFA_OBJECT_H_ +#include <map> #include <unordered_set> #include "fxjs/cfxjse_arguments.h" @@ -144,8 +145,8 @@ struct XFA_MAPMODULEDATA { XFA_MAPMODULEDATA(); ~XFA_MAPMODULEDATA(); - CFX_MapPtrToPtr m_ValueMap; - CFX_MapPtrTemplate<void*, XFA_MAPDATABLOCK*> m_BufferMap; + std::map<void*, void*> m_ValueMap; + std::map<void*, XFA_MAPDATABLOCK*> m_BufferMap; }; #define XFA_CalcRefCount (void*)(uintptr_t) FXBSTR_ID('X', 'F', 'A', 'R') @@ -665,7 +666,7 @@ class CXFA_Node : public CXFA_Object { bool bProtoAlso = true) const; bool HasMapModuleKey(void* pKey, bool bProtoAlso = false); void RemoveMapModuleKey(void* pKey = nullptr); - void MergeAllData(void* pDstModule, bool bUseSrcAttr = true); + void MergeAllData(void* pDstModule); void MoveBufferMapData(CXFA_Node* pDstModule, void* pKey); void MoveBufferMapData(CXFA_Node* pSrcModule, CXFA_Node* pDstModule, |