Replace CFX_MapPtrTemplate with std::map.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1181593003.

6 files changed, 63 insertions, 62 deletions

diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h
index e4e04f3ac8..52e1193a51 100644
--- a/fpdfsdk/include/formfiller/FFL_FormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h
@@ -19,8 +19,6 @@ class CPDFSDK_Document;
 class CPDFSDK_Widget;
 
 
-#define CFFL_PageView2PDFWindow		CFX_MapPtrTemplate<CPDFSDK_PageView*, CPWL_Wnd*>
-
 struct FFL_KeyStrokeData
 {
 	CFX_WideString		swValue;
@@ -78,11 +76,10 @@ public:
 	virtual void				DoCut(CPDFSDK_Document* pDocument);
 	virtual void				DoPaste(CPDFSDK_Document* pDocument);
 
-public: //CPWL_TimerHandler
+        // CPWL_TimerHandler
 	virtual void				TimerProc();
 	virtual IFX_SystemHandler*	GetSystemHandler() const;
 
-public:
 	virtual CPDF_Matrix			GetWindowMatrix(void* pAttachedData);
 	virtual CFX_WideString		LoadPopupMenuString(int nIndex);
 
@@ -121,7 +118,6 @@ public:
 
 	virtual void				GetKeyStrokeData(CPDFSDK_PageView* pPageView, FFL_KeyStrokeData& data);
 
-public:
 	CPWL_Wnd*					GetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bNew);
 	void						DestroyPDFWindow(CPDFSDK_PageView* pPageView);
 	void						EscapeFiller(CPDFSDK_PageView* pPageView, FX_BOOL bDestroyPDFWindow);
@@ -130,7 +126,6 @@ public:
 	virtual CPWL_Wnd*			NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView) = 0;
 	virtual CPDF_Rect			GetFocusBox(CPDFSDK_PageView* pPageView);
 
-public:
 	FX_BOOL						IsValid() const;
 	CPDF_Rect					GetPDFWindowRect() const;
 
@@ -140,14 +135,17 @@ public:
 	virtual void				InvalidateRect(double left, double top, double right, double bottom);
 	CPDFDoc_Environment*		GetApp(){return m_pApp;}
 	CPDFSDK_Annot*				GetSDKAnnot() {return m_pAnnot;}
+
 protected:
-	CPDFDoc_Environment*		m_pApp;
-	CPDFSDK_Widget*				m_pWidget;
-	CPDFSDK_Annot*				m_pAnnot;
+    using CFFL_PageView2PDFWindow = std::map<CPDFSDK_PageView*, CPWL_Wnd*>;
+
+    CPDFDoc_Environment* m_pApp;
+    CPDFSDK_Widget* m_pWidget;
+    CPDFSDK_Annot* m_pAnnot;
 
-	FX_BOOL						m_bValid;
-	CFFL_PageView2PDFWindow		m_Maps;
-	CPDF_Point					m_ptOldPos;
+    FX_BOOL m_bValid;
+    CFFL_PageView2PDFWindow m_Maps;
+    CPDF_Point m_ptOldPos;
 };
 
 class CFFL_Button : public CFFL_FormFiller
diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
index ddcc2c5efd..b27d1e68ba 100644
--- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
@@ -7,13 +7,13 @@
 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
 
+#include <map>
+
 #include "FormFiller.h"
 
 class CFFL_FormFiller;
 class CFFL_PrivateData;
 
-#define CFFL_Widget2Filler		CFX_MapPtrTemplate<CPDFSDK_Annot*, CFFL_FormFiller*>
-
 class CFFL_IFormFiller : public IPWL_Filler_Notify
 {
 public:
@@ -52,7 +52,6 @@ public:
 	virtual FX_BOOL				OnSetFocus(CPDFSDK_Annot* pAnnot,FX_UINT nFlag);
 	virtual FX_BOOL				OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
 
-public:
 	virtual void				QueryWherePopup(void* pPrivateData, FX_FLOAT fPopupMin,FX_FLOAT fPopupMax, int32_t & nRet, FX_FLOAT & fPopupRet);
 	virtual void				OnBeforeKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, int32_t nKeyCode,
 										CFX_WideString & strChange, const CFX_WideString& strChangeEx,
@@ -64,13 +63,11 @@ public:
 	virtual void				OnKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, int32_t nKeyCode, CFX_WideString & strChange,
 									const CFX_WideString& strChangeEx, FX_BOOL bKeyDown, FX_BOOL & bRC, FX_BOOL & bExit);
 
-public:
 	virtual void				BeforeUndo(CPDFSDK_Document* pDocument);
 	virtual void				BeforeRedo(CPDFSDK_Document* pDocument);
 	virtual void				AfterUndo(CPDFSDK_Document* pDocument);
 	virtual void				AfterRedo(CPDFSDK_Document* pDocument);
 
-public:
 	virtual FX_BOOL				CanCopy(CPDFSDK_Document* pDocument);
 	virtual FX_BOOL				CanCut(CPDFSDK_Document* pDocument);
 	virtual FX_BOOL				CanPaste(CPDFSDK_Document* pDocument);
@@ -79,7 +76,6 @@ public:
 	virtual void				DoCut(CPDFSDK_Document* pDocument);
 	virtual void				DoPaste(CPDFSDK_Document* pDocument);
 
-public:
 	CFFL_FormFiller*			GetFormFiller(CPDFSDK_Annot* pAnnot, FX_BOOL bRegister);
 	void						RemoveFormFiller(CPDFSDK_Annot* pAnnot);
 
@@ -96,12 +92,15 @@ public:
 	void						OnButtonUp(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bReset, FX_BOOL& bExit,FX_UINT nFlag);
 
 private:
-	void						UnRegisterFormFiller(CPDFSDK_Annot* pAnnot);
-	void						SetFocusAnnotTab(CPDFSDK_Annot* pWidget, FX_BOOL bSameField, FX_BOOL bNext);
+    using CFFL_Widget2Filler = std::map<CPDFSDK_Annot*, CFFL_FormFiller*>;
+
+    void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot);
+    void SetFocusAnnotTab(CPDFSDK_Annot* pWidget, FX_BOOL bSameField,
+                          FX_BOOL bNext);
 
-	CPDFDoc_Environment*				m_pApp;
-	CFFL_Widget2Filler			m_Maps;
-	FX_BOOL						m_bNotifying;
+    CPDFDoc_Environment* m_pApp;
+    CFFL_Widget2Filler m_Maps;
+    FX_BOOL m_bNotifying;
 };
 
 class CFFL_PrivateData
diff --git a/fpdfsdk/include/formfiller/FFL_ListBox.h b/fpdfsdk/include/formfiller/FFL_ListBox.h
index 81abec1cad..4c0813f5c8 100644
--- a/fpdfsdk/include/formfiller/FFL_ListBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ListBox.h
@@ -7,6 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
 
+#include <set>
+
 #include "FFL_FormFiller.h"
 
 class  CBA_FontMap;
@@ -14,32 +16,37 @@ class  CBA_FontMap;
 class CFFL_ListBox : public CFFL_FormFiller
 {
 public:
-	CFFL_ListBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget);
-	virtual ~CFFL_ListBox();
+    CFFL_ListBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget);
+    virtual ~CFFL_ListBox();
 
-	virtual	PWL_CREATEPARAM		GetCreateParam();
-	virtual CPWL_Wnd*			NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView);
+    virtual PWL_CREATEPARAM GetCreateParam();
+    virtual CPWL_Wnd* NewPDFWindow(const PWL_CREATEPARAM& cp,
+                                   CPDFSDK_PageView* pPageView);
 
-	virtual FX_BOOL				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
+    virtual FX_BOOL OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar,
+                           FX_UINT nFlags);
 
-	virtual FX_BOOL				IsDataChanged(CPDFSDK_PageView* pPageView);
-	virtual void				SaveData(CPDFSDK_PageView* pPageView);
+    virtual FX_BOOL IsDataChanged(CPDFSDK_PageView* pPageView);
+    virtual void SaveData(CPDFSDK_PageView* pPageView);
 
- 	virtual void				GetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type,
- 									PDFSDK_FieldAction& fa);
- 	virtual void				SetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type,
- 									const PDFSDK_FieldAction& fa);
+    virtual void GetActionData(CPDFSDK_PageView* pPageView,
+                               CPDF_AAction::AActionType type,
+                               PDFSDK_FieldAction& fa);
+    virtual void SetActionData(CPDFSDK_PageView* pPageView,
+                               CPDF_AAction::AActionType type,
+                               const PDFSDK_FieldAction& fa);
 
-	virtual void				SaveState(CPDFSDK_PageView* pPageView);
-	virtual void				RestoreState(CPDFSDK_PageView* pPageView);
+    virtual void SaveState(CPDFSDK_PageView* pPageView);
+    virtual void RestoreState(CPDFSDK_PageView* pPageView);
 
-	virtual CPWL_Wnd*			ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRestoreValue);
-	virtual void				OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag);
+    virtual CPWL_Wnd* ResetPDFWindow(CPDFSDK_PageView* pPageView,
+                                     FX_BOOL bRestoreValue);
+    virtual void OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag);
 
 private:
-	CBA_FontMap*					m_pFontMap;
-	CFX_MapPtrTemplate<int, void*>	m_OriginSelections;
-	CFX_ArrayTemplate<int>			m_State;
+    CBA_FontMap* m_pFontMap;
+    std::set<int> m_OriginSelections;
+    CFX_ArrayTemplate<int> m_State;
 };
 
 
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index 521c46e4f1..b4705699c8 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -219,8 +219,6 @@ private:
 	CPDFDoc_Environment*		m_pApp;
 };
 
-//#define CBF_Page2Accessible	 CFX_MapPtrTemplate<CPDFSDK_PageView*, IAccessible*>
-
 typedef int (*AI_COMPARE) (CPDFSDK_Annot* p1, CPDFSDK_Annot* p2);
 
 class CPDFSDK_AnnotIterator
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
index 718ff60ab5..edbd5e4efc 100644
--- a/fpdfsdk/include/fsdk_baseform.h
+++ b/fpdfsdk/include/fsdk_baseform.h
@@ -13,6 +13,8 @@
 #include <ctime>
 #endif
 
+#include <map>
+
 #include "../../core/include/fpdfapi/fpdf_parser.h"
 #include "../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../core/include/fxcrt/fx_basic.h"
@@ -165,8 +167,6 @@ private:
 	int32_t						m_nValueAge;
 };
 
-#define CPDFSDK_WidgetMap				CFX_MapPtrTemplate<CPDF_FormControl*, CPDFSDK_Widget*>
-
 class CPDFSDK_InterForm : public CPDF_FormNotify
 {
 public:
@@ -201,7 +201,6 @@ public:
 	void							ResetFieldAppearance(CPDF_FormField* pFormField, const FX_WCHAR* sValue, FX_BOOL bValueChanged);
 	void							UpdateField(CPDF_FormField* pFormField);
 
-public:
 	FX_BOOL							DoAction_Hide(const CPDF_Action& action);
 	FX_BOOL							DoAction_SubmitForm(const CPDF_Action& action);
 	FX_BOOL							DoAction_ResetForm(const CPDF_Action& action);
@@ -227,18 +226,18 @@ private:
 	virtual int						BeforeFormImportData(const CPDF_InterForm* pForm);
 	virtual int						AfterFormImportData(const CPDF_InterForm* pForm);
 
-private:
 	FX_BOOL							FDFToURLEncodedData(CFX_WideString csFDFFile, CFX_WideString csTxtFile);
 	FX_BOOL							FDFToURLEncodedData(uint8_t*& pBuf, FX_STRSIZE& nBufSize);
 	int								GetPageIndexByAnnotDict(CPDF_Document* pDocument, CPDF_Dictionary* pAnnotDict) const;
 	void							DoFDFBuffer(CFX_ByteString sBuffer);
 
-private:
-	CPDFSDK_Document*				m_pDocument;
-	CPDF_InterForm*					m_pInterForm;
-	CPDFSDK_WidgetMap				m_Map;
-	FX_BOOL							m_bCalculate;
-	FX_BOOL							m_bBusy;
+    using CPDFSDK_WidgetMap = std::map<CPDF_FormControl*, CPDFSDK_Widget*>;
+
+    CPDFSDK_Document* m_pDocument;
+    CPDF_InterForm* m_pInterForm;
+    CPDFSDK_WidgetMap m_Map;
+    FX_BOOL m_bCalculate;
+    FX_BOOL m_bBusy;
 
 public:
 	FX_BOOL IsNeedHighLight(int nFieldType);
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 18092bb8bc..43f6bf09f1 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -7,6 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_FSDK_MGR_H_
 #define FPDFSDK_INCLUDE_FSDK_MGR_H_
 
+#include <map>
+
 #include "../../core/include/fpdftext/fpdf_text.h"
 #include "../../public/fpdf_formfill.h"
 #include "../../public/fpdf_fwlevent.h" // cross platform keycode and events define.
@@ -372,8 +374,6 @@ public:
 	CPDFSDK_InterForm*		GetInterForm() ;
 	CPDF_Document*			GetDocument() {return m_pDoc;}
 
-	void					InitPageView();
-	void					AddPageView(CPDF_Page* pPDFPage, CPDFSDK_PageView* pPageView);
 	CPDFSDK_PageView*		GetPageView(CPDF_Page* pPDFPage, FX_BOOL ReNew = TRUE);
 	CPDFSDK_PageView*		GetPageView(int nIndex);
 	CPDFSDK_PageView*		GetCurrentView();
@@ -406,13 +406,13 @@ public:
 	FX_BOOL					ProcOpenAction();
 	CPDF_OCContext*			GetOCContext();
 private:
-	CFX_MapPtrTemplate<CPDF_Page*, CPDFSDK_PageView*> m_pageMap;
-	CPDF_Document*			m_pDoc;
-	CPDFSDK_InterForm*		m_pInterForm;
-	CPDFSDK_Annot*			m_pFocusAnnot;
-	CPDFDoc_Environment *	m_pEnv;
-	CPDF_OCContext *		m_pOccontent;
-	FX_BOOL					m_bChangeMask;
+    std::map<CPDF_Page*, CPDFSDK_PageView*> m_pageMap;
+    CPDF_Document* m_pDoc;
+    CPDFSDK_InterForm* m_pInterForm;
+    CPDFSDK_Annot* m_pFocusAnnot;
+    CPDFDoc_Environment* m_pEnv;
+    CPDF_OCContext* m_pOccontent;
+    FX_BOOL m_bChangeMask;
 };
 class CPDFSDK_PageView final
 {