Merge to XFA: CFX_MapByteStringToPtr considered harmful (combo patch).

fpdfsdk/include/fsdk_annothandler.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 FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
 #define FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
 
+#include <map>
+
 #include "../../core/include/fxcrt/fx_basic.h"
 
 #define FSDK_XFAWIDGET_TYPENAME "XFAWidget"
 
 class CFFL_IFormFiller;
 class CFX_RenderDevice;
 class CPDFDoc_Environment;
 class CPDFSDK_Annot;
 class CPDFSDK_PageView;
 class CPDF_Annot;
@@ skipping 400 matching lines @@
   virtual FX_BOOL Annot_OnHitTest(CPDFSDK_PageView* pPageView,
                                   CPDFSDK_Annot* pAnnot,
                                   const CPDF_Point& point);
 
  private:
   IPDFSDK_AnnotHandler* GetAnnotHandler(const CFX_ByteString& sType) const;
   CPDFSDK_Annot* GetNextAnnot(CPDFSDK_Annot* pSDKAnnot, FX_BOOL bNext);
 
  private:
   CBA_AnnotHandlerArray m_Handlers;
-  CFX_MapByteStringToPtr m_mapType2Handler;
+  std::map<CFX_ByteString, IPDFSDK_AnnotHandler*> m_mapType2Handler;
   CPDFDoc_Environment* m_pApp;
 };
 
 typedef int (*AI_COMPARE)(CPDFSDK_Annot* p1, CPDFSDK_Annot* p2);
 
 class CPDFSDK_AnnotIterator {
  public:
   CPDFSDK_AnnotIterator(CPDFSDK_PageView* pPageView,
                         FX_BOOL bReverse,
                         FX_BOOL bIgnoreTopmost = FALSE,
@@ skipping 18 matching lines @@
   CPDFSDK_Annot* NextAnnot(int& index);
   CPDFSDK_Annot* PrevAnnot(int& index);
 
   CFX_PtrArray m_pIteratorAnnotList;
   FX_BOOL m_bReverse;
   FX_BOOL m_bIgnoreTopmost;
   FX_BOOL m_bCircle;
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_