Use string pools in some dictionaries

fpdfsdk/cpdfsdk_widget.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_widget.h"
 
 #include <memory>
 
@@ skipping 1797 matching lines @@
   FX_FLOAT fc[4];
   pFormCtrl->GetOriginalBackgroundColor(iColorType, fc);
   if (iColorType > 0)
     crFill = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
 
   return crFill;
 }
 
 void CPDFSDK_Widget::AddImageToAppearance(const CFX_ByteString& sAPType,
                                           CPDF_Stream* pImage) {
-  CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
-  ASSERT(pDoc);
-
   CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDictFor("AP");
   CPDF_Stream* pStream = pAPDict->GetStreamFor(sAPType);
   CPDF_Dictionary* pStreamDict = pStream->GetDict();
   CFX_ByteString sImageAlias = "IMG";
 
   if (CPDF_Dictionary* pImageDict = pImage->GetDict()) {
     sImageAlias = pImageDict->GetStringFor("Name");
     if (sImageAlias.IsEmpty())
       sImageAlias = "IMG";
   }
 
+  CPDF_Document* pDoc = m_pPageView->GetPDFDocument();

[dsinclair, 2016/09/19 13:24:34]

Can we add the ASSERT back in here? We don't de-reference the pDoc in this
method so we'll end up crashing somewhere else when we should be crashing here.

[Tom Sepez, 2016/09/19 18:24:59]

We now de-ref it due to the  has-a change.  Also the if at 1837 is pointless
since we believe |new| can't fail and has been removed.

   CPDF_Dictionary* pStreamResList = pStreamDict->GetDictFor("Resources");
   if (!pStreamResList) {
-    pStreamResList = new CPDF_Dictionary();
+    pStreamResList = new CPDF_Dictionary(pDoc);
     pStreamDict->SetFor("Resources", pStreamResList);
   }
 
   if (pStreamResList) {
-    CPDF_Dictionary* pXObject = new CPDF_Dictionary;
+    CPDF_Dictionary* pXObject = new CPDF_Dictionary(pDoc);
     pXObject->SetReferenceFor(sImageAlias, pDoc, pImage);
     pStreamResList->SetFor("XObject", pXObject);
   }
 }
 
 void CPDFSDK_Widget::RemoveAppearance(const CFX_ByteString& sAPType) {
   if (CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDictFor("AP"))
     pAPDict->RemoveFor(sAPType);
 }
 
@@ skipping 101 matching lines @@
     return FALSE;
 
   if (!IsVisible())
     return FALSE;
 
   if ((GetFieldFlags() & FIELDFLAG_READONLY) == FIELDFLAG_READONLY)
     return FALSE;
 
   return TRUE;
 }