Use string pools in some dictionaries

fpdfsdk/cpdfsdk_baannot.cpp

 // Copyright 2016 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
 
 #include "fpdfsdk/include/cpdfsdk_baannot.h"
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
@@ skipping 144 matching lines @@
   m_pAnnot->GetAnnotDict()->SetIntegerFor("StructParent", key);
 }
 
 int CPDFSDK_BAAnnot::GetStructParent() const {
   return m_pAnnot->GetAnnotDict()->GetIntegerFor("StructParent");
 }
 
 // border
 void CPDFSDK_BAAnnot::SetBorderWidth(int nWidth) {
   CPDF_Array* pBorder = m_pAnnot->GetAnnotDict()->GetArrayFor("Border");
-
   if (pBorder) {
     pBorder->SetAt(2, new CPDF_Number(nWidth));
   } else {
     CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDictFor("BS");
-
     if (!pBSDict) {
-      pBSDict = new CPDF_Dictionary;
+      pBSDict = new CPDF_Dictionary(m_pAnnot->GetDocument());
       m_pAnnot->GetAnnotDict()->SetFor("BS", pBSDict);
     }
-
     pBSDict->SetIntegerFor("W", nWidth);
   }
 }
 
 int CPDFSDK_BAAnnot::GetBorderWidth() const {
-  if (CPDF_Array* pBorder = m_pAnnot->GetAnnotDict()->GetArrayFor("Border")) {
+  if (CPDF_Array* pBorder = m_pAnnot->GetAnnotDict()->GetArrayFor("Border"))
     return pBorder->GetIntegerAt(2);
-  }
-  if (CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDictFor("BS")) {
+
+  if (CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDictFor("BS"))
     return pBSDict->GetIntegerFor("W", 1);
-  }
+
   return 1;
 }
 
 void CPDFSDK_BAAnnot::SetBorderStyle(BorderStyle nStyle) {
   CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDictFor("BS");
   if (!pBSDict) {
-    pBSDict = new CPDF_Dictionary;
+    pBSDict = new CPDF_Dictionary(m_pAnnot->GetDocument());
     m_pAnnot->GetAnnotDict()->SetFor("BS", pBSDict);
   }
 
   switch (nStyle) {
     case BorderStyle::SOLID:
       pBSDict->SetNameFor("S", "S");
       break;
     case BorderStyle::DASH:
       pBSDict->SetNameFor("S", "D");
       break;
@@ skipping 86 matching lines @@
 
   return FALSE;
 }
 
 void CPDFSDK_BAAnnot::WriteAppearance(const CFX_ByteString& sAPType,
                                       const CFX_FloatRect& rcBBox,
                                       const CFX_Matrix& matrix,
                                       const CFX_ByteString& sContents,
                                       const CFX_ByteString& sAPState) {
   CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDictFor("AP");
-
   if (!pAPDict) {
-    pAPDict = new CPDF_Dictionary;
+    pAPDict = new CPDF_Dictionary(m_pAnnot->GetDocument());
     m_pAnnot->GetAnnotDict()->SetFor("AP", pAPDict);
   }
 
   CPDF_Stream* pStream = nullptr;
   CPDF_Dictionary* pParentDict = nullptr;
-
   if (sAPState.IsEmpty()) {
     pParentDict = pAPDict;
     pStream = pAPDict->GetStreamFor(sAPType);
   } else {
     CPDF_Dictionary* pAPTypeDict = pAPDict->GetDictFor(sAPType);
     if (!pAPTypeDict) {
-      pAPTypeDict = new CPDF_Dictionary;
+      pAPTypeDict = new CPDF_Dictionary(m_pAnnot->GetDocument());
       pAPDict->SetFor(sAPType, pAPTypeDict);
     }
     pParentDict = pAPTypeDict;
     pStream = pAPTypeDict->GetStreamFor(sAPState);
   }
 
   if (!pStream) {
     pStream = new CPDF_Stream(nullptr, 0, nullptr);
     CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
     int32_t objnum = pDoc->AddIndirectObject(pStream);
     pParentDict->SetReferenceFor(sAPType, pDoc, objnum);
   }
 
   CPDF_Dictionary* pStreamDict = pStream->GetDict();
   if (!pStreamDict) {
-    pStreamDict = new CPDF_Dictionary;
+    pStreamDict = new CPDF_Dictionary(m_pAnnot->GetDocument());
     pStreamDict->SetNameFor("Type", "XObject");
     pStreamDict->SetNameFor("Subtype", "Form");
     pStreamDict->SetIntegerFor("FormType", 1);
     pStream->InitStream(nullptr, 0, pStreamDict);
   }
 
   if (pStreamDict) {
     pStreamDict->SetMatrixFor("Matrix", matrix);
     pStreamDict->SetRectFor("BBox", rcBBox);
   }
@@ skipping 58 matching lines @@
                                    CPDF_RenderOptions* pOptions) {
   m_pAnnot->GetAPForm(m_pPageView->GetPDFPage(), CPDF_Annot::Normal);
   m_pAnnot->DrawAppearance(m_pPageView->GetPDFPage(), pDevice, pUser2Device,
                            CPDF_Annot::Normal, nullptr);
 }
 
 void CPDFSDK_BAAnnot::SetOpenState(bool bOpenState) {
   if (CPDF_Annot* pAnnot = m_pAnnot->GetPopupAnnot())
     pAnnot->SetOpenState(bOpenState);
 }