diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index dcdd89c..57e7bc0 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -12,6 +12,7 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
+#include "core/fxcrt/include/fx_memory.h"
 #include "core/fxge/include/fx_ge.h"
 
 CPDF_Annot::CPDF_Annot(CPDF_Dictionary* pDict, CPDF_Document* pDocument)
@@ -24,9 +25,6 @@
 }
 
 void CPDF_Annot::ClearCachedAP() {
-  for (const auto& pair : m_APMap) {
-    delete pair.second;
-  }
   m_APMap.clear();
 }
 CFX_ByteString CPDF_Annot::GetSubType() const {
@@ -90,12 +88,12 @@
 
   auto it = m_APMap.find(pStream);
   if (it != m_APMap.end())
-    return it->second;
+    return it->second.get();
 
   CPDF_Form* pNewForm =
       new CPDF_Form(m_pDocument, pPage->m_pResources, pStream);
   pNewForm->ParseContent(nullptr, nullptr, nullptr);
-  m_APMap[pStream] = pNewForm;
+  m_APMap[pStream] = WrapUnique(pNewForm);
   return pNewForm;
 }
 
diff --git a/core/fpdfdoc/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h
index b5d9186..eab76a6 100644
--- a/core/fpdfdoc/cpdf_annot.h
+++ b/core/fpdfdoc/cpdf_annot.h
@@ -64,7 +64,7 @@
   CPDF_Dictionary* const m_pAnnotDict;
   CPDF_Document* const m_pDocument;
   const CFX_ByteString m_sSubtype;
-  std::map<CPDF_Stream*, CPDF_Form*> m_APMap;
+  std::map<CPDF_Stream*, std::unique_ptr<CPDF_Form>> m_APMap;
 };
 
 #endif  // CORE_FPDFDOC_CPDF_ANNOT_H_