Make CPDF_Dictionary methods take CFX_ByteString arguments

fpdfsdk/fsdk_baseannot.cpp

 // Copyright 2014 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 <algorithm>
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
@@ skipping 811 matching lines @@
   if (!pAPDict) {
     pAPDict = new CPDF_Dictionary;
     m_pAnnot->GetAnnotDict()->SetAt("AP", pAPDict);
   }
 
   CPDF_Stream* pStream = nullptr;
   CPDF_Dictionary* pParentDict = nullptr;
 
   if (sAPState.IsEmpty()) {
     pParentDict = pAPDict;
-    pStream = pAPDict->GetStreamBy(sAPType.AsStringC());
+    pStream = pAPDict->GetStreamBy(sAPType);
   } else {
-    CPDF_Dictionary* pAPTypeDict = pAPDict->GetDictBy(sAPType.AsStringC());
+    CPDF_Dictionary* pAPTypeDict = pAPDict->GetDictBy(sAPType);
     if (!pAPTypeDict) {
       pAPTypeDict = new CPDF_Dictionary;
-      pAPDict->SetAt(sAPType.AsStringC(), pAPTypeDict);
+      pAPDict->SetAt(sAPType, pAPTypeDict);
     }
     pParentDict = pAPTypeDict;
-    pStream = pAPTypeDict->GetStreamBy(sAPState.AsStringC());
+    pStream = pAPTypeDict->GetStreamBy(sAPState);
   }
 
   if (!pStream) {
     pStream = new CPDF_Stream(nullptr, 0, nullptr);
     CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
     int32_t objnum = pDoc->AddIndirectObject(pStream);
-    pParentDict->SetAtReference(sAPType.AsStringC(), pDoc, objnum);
+    pParentDict->SetAtReference(sAPType, pDoc, objnum);
   }
 
   CPDF_Dictionary* pStreamDict = pStream->GetDict();
   if (!pStreamDict) {
     pStreamDict = new CPDF_Dictionary;
     pStreamDict->SetAtName("Type", "XObject");
     pStreamDict->SetAtName("Subtype", "Form");
     pStreamDict->SetAtInteger("FormType", 1);
     pStream->InitStream(nullptr, 0, pStreamDict);
   }
@@ skipping 96 matching lines @@
 
 CPDF_Page* CPDFSDK_Annot::GetPDFPage() {
   return m_pPageView ? m_pPageView->GetPDFPage() : nullptr;
 }
 
 #ifdef PDF_ENABLE_XFA
 CPDFXFA_Page* CPDFSDK_Annot::GetPDFXFAPage() {
   return m_pPageView ? m_pPageView->GetPDFXFAPage() : nullptr;
 }
 #endif  // PDF_ENABLE_XFA