Merge to XFA: Replace several more CFX_MapPtrToPtr with std::set or std::map

core/include/fpdfdoc/fpdf_doc.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
 #define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
 
 #include <map>
@@ skipping 403 matching lines @@
   void ClearCachedAP();
 
   void DrawBorder(CFX_RenderDevice* pDevice,
                   const CFX_Matrix* pUser2Device,
                   const CPDF_RenderOptions* pOptions);
 
   CPDF_Form* GetAPForm(const CPDF_Page* pPage, AppearanceMode mode);
 
  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 {
  public:
   explicit CPDF_AnnotList(CPDF_Page* pPage);
   ~CPDF_AnnotList();
 
   void DisplayAnnots(const CPDF_Page* pPage,
                      CPDF_RenderContext* pContext,
                      FX_BOOL bPrinting,
@@ skipping 717 matching lines @@
   CFX_WideString GetCaption(const CFX_ByteStringC& csEntry) const;
 
   CPDF_Stream* GetIcon(const CFX_ByteStringC& csEntry) const;
 
   CPDF_Dictionary* const m_pDict;
 };
 
 CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath);
 
 #endif  // CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_