Remove the use of handler array in CPDFSDK_AnnotHandlerMgr

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 <memory>
 #include <vector>
 
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 
 #ifdef PDF_ENABLE_XFA
 #define FSDK_XFAWIDGET_TYPENAME "XFAWidget"
 #endif  // PDF_ENABLE_XFA
 
 class CFFL_IFormFiller;
@@ skipping 286 matching lines @@
 
  private:
   CXFA_FFWidgetHandler* GetXFAWidgetHandler(CPDFSDK_Annot* pAnnot);
   uint32_t GetFWLFlags(uint32_t dwFlag);
 
  private:
   CPDFDoc_Environment* m_pApp;
 };
 #endif  // PDF_ENABLE_XFA
 
-#define CBA_AnnotHandlerArray CFX_ArrayTemplate<IPDFSDK_AnnotHandler*>
 class CPDFSDK_AnnotHandlerMgr {
  public:
   // Destroy the handler
   explicit CPDFSDK_AnnotHandlerMgr(CPDFDoc_Environment* pApp);
   virtual ~CPDFSDK_AnnotHandlerMgr();
 
  public:
   void RegisterAnnotHandler(IPDFSDK_AnnotHandler* pAnnotHandler);
   void UnRegisterAnnotHandler(IPDFSDK_AnnotHandler* pAnnotHandler);
 
@@ skipping 74 matching lines @@
                                             CPDFSDK_Annot* pAnnot);
   virtual FX_BOOL Annot_OnHitTest(CPDFSDK_PageView* pPageView,
                                   CPDFSDK_Annot* pAnnot,
                                   const CFX_FloatPoint& point);
 
  private:
   IPDFSDK_AnnotHandler* GetAnnotHandler(const CFX_ByteString& sType) const;
   CPDFSDK_Annot* GetNextAnnot(CPDFSDK_Annot* pSDKAnnot, FX_BOOL bNext);
 
  private:
-  CBA_AnnotHandlerArray m_Handlers;
-  std::map<CFX_ByteString, IPDFSDK_AnnotHandler*> m_mapType2Handler;
+  std::map<CFX_ByteString, std::unique_ptr<IPDFSDK_AnnotHandler>>
+      m_mapType2Handler;
   CPDFDoc_Environment* m_pApp;
 };
 
 class CPDFSDK_AnnotIterator {
  public:
   CPDFSDK_AnnotIterator(CPDFSDK_PageView* pPageView, bool bReverse);
   ~CPDFSDK_AnnotIterator();
 
   CPDFSDK_Annot* Next();
 
  private:
   CPDFSDK_Annot* NextAnnot();
   CPDFSDK_Annot* PrevAnnot();
 
   std::vector<CPDFSDK_Annot*> m_iteratorAnnotList;
   const bool m_bReverse;
   size_t m_pos;
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_