Make CPDF_Dictionary methods take CFX_ByteString arguments

core/fpdfapi/fpdf_page/fpdf_page_parser.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 "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <vector>
 
@@ skipping 548 matching lines @@
     if (type != CPDF_StreamParser::Name) {
       break;
     }
     CFX_ByteString key((const FX_CHAR*)m_pSyntax->GetWordBuf() + 1,
                        m_pSyntax->GetWordSize() - 1);
     std::unique_ptr<CPDF_Object, ReleaseDeleter<CPDF_Object>> pObj(
         m_pSyntax->ReadNextObject());
     if (!key.IsEmpty()) {
       uint32_t dwObjNum = pObj ? pObj->GetObjNum() : 0;
       if (dwObjNum)
-        pDict->SetAtReference(key.AsStringC(), m_pDocument, dwObjNum);
+        pDict->SetAtReference(key, m_pDocument, dwObjNum);
       else
-        pDict->SetAt(key.AsStringC(), pObj.release());
+        pDict->SetAt(key, pObj.release());
     }
   }
   PDF_ReplaceAbbr(pDict);
   CPDF_Object* pCSObj = NULL;
   if (pDict->KeyExist("ColorSpace")) {
     pCSObj = pDict->GetDirectObjectBy("ColorSpace");
     if (pCSObj->IsName()) {
       CFX_ByteString name = pCSObj->GetString();
       if (name != "DeviceRGB" && name != "DeviceGray" && name != "DeviceCMYK") {
         pCSObj = FindResourceObj("ColorSpace", name);
@@ skipping 132 matching lines @@
 
   if (m_Options.m_bTextOnly) {
     if (!m_pResources)
       return;
 
     CPDF_Dictionary* pList = m_pResources->GetDictBy("XObject");
     if (!pList && m_pPageResources && m_pResources != m_pPageResources)
       pList = m_pPageResources->GetDictBy("XObject");
     if (!pList)
       return;
-    CPDF_Reference* pRes = ToReference(pList->GetObjectBy(name.AsStringC()));
+    CPDF_Reference* pRes = ToReference(pList->GetObjectBy(name));
     if (!pRes)
       return;
 
     FX_BOOL bForm;
     if (m_pDocument->IsFormStream(pRes->GetRefObjNum(), bForm) && !bForm)
       return;
   }
 
   CPDF_Stream* pXObject = ToStream(FindResourceObj("XObject", name));
   if (!pXObject) {
@@ skipping 516 matching lines @@
     const CFX_ByteStringC& type,
     const CFX_ByteString& name) {
   if (!m_pResources) {
     return NULL;
   }
   if (m_pResources == m_pPageResources) {
     CPDF_Dictionary* pList = m_pResources->GetDictBy(type);
     if (!pList) {
       return NULL;
     }
-    CPDF_Object* pRes = pList->GetDirectObjectBy(name.AsStringC());
+    CPDF_Object* pRes = pList->GetDirectObjectBy(name);
     return pRes;
   }
   CPDF_Dictionary* pList = m_pResources->GetDictBy(type);
   if (!pList) {
     if (!m_pPageResources) {
       return NULL;
     }
     CPDF_Dictionary* pList = m_pPageResources->GetDictBy(type);
     if (!pList) {
       return NULL;
     }
-    CPDF_Object* pRes = pList->GetDirectObjectBy(name.AsStringC());
+    CPDF_Object* pRes = pList->GetDirectObjectBy(name);
     return pRes;
   }
-  CPDF_Object* pRes = pList->GetDirectObjectBy(name.AsStringC());
+  CPDF_Object* pRes = pList->GetDirectObjectBy(name);
   return pRes;
 }
 
 CPDF_Font* CPDF_StreamContentParser::FindFont(const CFX_ByteString& name) {
   CPDF_Dictionary* pFontDict = ToDictionary(FindResourceObj("Font", name));
   if (!pFontDict) {
     m_bResourceMissing = TRUE;
     return CPDF_Font::GetStockFont(m_pDocument, "Helvetica");
   }
 
@@ skipping 500 matching lines @@
             op.key = key;
             op.replacement = fullname;
             replacements.push_back(op);
           }
         } else {
           PDF_ReplaceAbbr(value);
         }
       }
       for (const auto& op : replacements) {
         if (op.is_replace_key)
-          pDict->ReplaceKey(op.key.AsStringC(), op.replacement);
+          pDict->ReplaceKey(op.key, op.replacement);
         else
-          pDict->SetAtName(op.key.AsStringC(), op.replacement);
+          pDict->SetAtName(op.key, op.replacement);
       }
       break;
     }
     case CPDF_Object::ARRAY: {
       CPDF_Array* pArray = pObj->AsArray();
       for (size_t i = 0; i < pArray->GetCount(); i++) {
         CPDF_Object* pElement = pArray->GetObjectAt(i);
         if (pElement->IsName()) {
           CFX_ByteString name = pElement->GetString();
           CFX_ByteStringC fullname = PDF_FindFullName(
               PDF_InlineValueAbbr, FX_ArraySize(PDF_InlineValueAbbr),
               name.AsStringC());
           if (!fullname.IsEmpty()) {
             pArray->SetAt(i, new CPDF_Name(fullname));
           }
         } else {
           PDF_ReplaceAbbr(pElement);
         }
       }
       break;
     }
     default:
       break;
   }
 }