Make CPDF_Object subclass constructors intern strings

Make CDPF_Arrays intern the object they create.
Allow passing nullptr as a CFX_WeakPtr shortcut as well.

Review-Url: https://codereview.chromium.org/2509123002

1 files changed, 5 insertions, 5 deletions

diff --git a/fpdfsdk/fpdfppo.cpp b/fpdfsdk/fpdfppo.cpp
index ec3312b121..915de1ad07 100644
--- a/fpdfsdk/fpdfppo.cpp
+++ b/fpdfsdk/fpdfppo.cpp
@@ -160,24 +160,24 @@ bool CPDF_PageOrganizer::PDFDocInit() {
 
   CFX_ByteString producerstr;
   producerstr.Format("PDFium");
-  pDocInfoDict->SetFor("Producer", new CPDF_String(producerstr, false));
+  pDocInfoDict->SetFor("Producer",
+                       new CPDF_String(nullptr, producerstr, false));
 
   CFX_ByteString cbRootType = pNewRoot->GetStringFor("Type", "");
   if (cbRootType.IsEmpty())
-    pNewRoot->SetFor("Type", new CPDF_Name("Catalog"));
+    pNewRoot->SetFor("Type", new CPDF_Name(nullptr, "Catalog"));
 
   CPDF_Object* pElement = pNewRoot->GetObjectFor("Pages");
   CPDF_Dictionary* pNewPages =
       pElement ? ToDictionary(pElement->GetDirect()) : nullptr;
   if (!pNewPages) {
-    pNewPages = m_pDestPDFDoc->NewIndirect<CPDF_Dictionary>(
-        m_pDestPDFDoc->GetByteStringPool());
+    pNewPages = m_pDestPDFDoc->NewIndirect<CPDF_Dictionary>();
     pNewRoot->SetReferenceFor("Pages", m_pDestPDFDoc, pNewPages);
   }
 
   CFX_ByteString cbPageType = pNewPages->GetStringFor("Type", "");
   if (cbPageType.IsEmpty())
-    pNewPages->SetFor("Type", new CPDF_Name("Pages"));
+    pNewPages->SetFor("Type", new CPDF_Name(nullptr, "Pages"));
 
   if (!pNewPages->GetArrayFor("Kids")) {
     pNewPages->SetIntegerFor("Count", 0);