From 9ca2b09126b80c03655f0eee1f02e1b2d0a18230 Mon Sep 17 00:00:00 2001
From: weili <weili@chromium.org>
Date: Thu, 21 Jul 2016 12:26:18 -0700
Subject: Remove the use of handler array in CPDFSDK_AnnotHandlerMgr

Use map to store and manage the handlers directly instead of needing
an extra array.

Review-Url: https://codereview.chromium.org/2166953005
---
 fpdfsdk/include/fsdk_annothandler.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'fpdfsdk/include')

diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index 179843da8a..1e25538a32 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -8,6 +8,7 @@
 #define FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
 
 #include <map>
+#include <memory>
 #include <vector>
 
 #include "core/fxcrt/include/fx_basic.h"
@@ -314,7 +315,6 @@ class CPDFSDK_XFAAnnotHandler : public IPDFSDK_AnnotHandler {
 };
 #endif  // PDF_ENABLE_XFA
 
-#define CBA_AnnotHandlerArray CFX_ArrayTemplate<IPDFSDK_AnnotHandler*>
 class CPDFSDK_AnnotHandlerMgr {
  public:
   // Destroy the handler
@@ -409,8 +409,8 @@ class CPDFSDK_AnnotHandlerMgr {
   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;
 };
 
-- 
cgit v1.2.3