Merge to XFA: Member function name refactoring

core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.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/include/fpdfapi/fpdf_parser.h"
 
 #include "core/include/fpdfapi/fpdf_serial.h"
 
@@ skipping 57 matching lines @@
       word = parser.GetNextWord(nullptr);
       if (word != "endobj") {
         break;
       }
     } else {
       if (word != "trailer") {
         break;
       }
       if (CPDF_Dictionary* pMainDict =
               ToDictionary(parser.GetObject(this, 0, 0, true))) {
-        m_pRootDict = pMainDict->GetDict("Root");
+        m_pRootDict = pMainDict->GetDictBy("Root");
         pMainDict->Release();
       }
       break;
     }
   }
 }
 FX_BOOL CFDF_Document::WriteBuf(CFX_ByteTextBuf& buf) const {
   if (!m_pRootDict) {
     return FALSE;
   }
   buf << "%FDF-1.2\r\n";
   for (const auto& pair : m_IndirectObjs) {
     buf << pair.first << " 0 obj\r\n" << pair.second << "\r\nendobj\r\n\r\n";
   }
   buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
       << " 0 R>>\r\n%%EOF\r\n";
   return TRUE;
 }
 CFX_WideString CFDF_Document::GetWin32Path() const {
-  CPDF_Dictionary* pDict = m_pRootDict ? m_pRootDict->GetDict("FDF") : NULL;
+  CPDF_Dictionary* pDict = m_pRootDict ? m_pRootDict->GetDictBy("FDF") : NULL;
   CPDF_Object* pFileSpec = pDict ? pDict->GetElementValue("F") : NULL;
   if (!pFileSpec)
     return CFX_WideString();
   if (pFileSpec->IsString())
-    return FPDF_FileSpec_GetWin32Path(m_pRootDict->GetDict("FDF"));
+    return FPDF_FileSpec_GetWin32Path(m_pRootDict->GetDictBy("FDF"));
   return FPDF_FileSpec_GetWin32Path(pFileSpec);
 }
 static CFX_WideString ChangeSlash(const FX_WCHAR* str) {
   CFX_WideString result;
   while (*str) {
     if (*str == '\\') {
       result += '/';
     } else if (*str == '/') {
       result += '\\';
     } else {
@@ skipping 26 matching lines @@
     pFileDict->SetAtString("F", CFX_ByteString::FromUnicode(result));
     pFileDict->SetAtString("UF", PDF_EncodeText(result));
     pFileDict->RemoveAt("FS");
   }
 }
 CFX_WideString FPDF_FileSpec_GetWin32Path(const CPDF_Object* pFileSpec) {
   CFX_WideString wsFileName;
   if (!pFileSpec) {
     wsFileName = CFX_WideString();
   } else if (const CPDF_Dictionary* pDict = pFileSpec->AsDictionary()) {
-    wsFileName = pDict->GetUnicodeText("UF");
+    wsFileName = pDict->GetUnicodeTextBy("UF");
     if (wsFileName.IsEmpty()) {
-      wsFileName = CFX_WideString::FromLocal(pDict->GetString("F"));
+      wsFileName = CFX_WideString::FromLocal(pDict->GetStringBy("F"));
     }
-    if (pDict->GetString("FS") == "URL") {
+    if (pDict->GetStringBy("FS") == "URL") {
       return wsFileName;
     }
     if (wsFileName.IsEmpty() && pDict->KeyExist("DOS")) {
-      wsFileName = CFX_WideString::FromLocal(pDict->GetString("DOS"));
+      wsFileName = CFX_WideString::FromLocal(pDict->GetStringBy("DOS"));
     }
   } else {
     wsFileName = CFX_WideString::FromLocal(pFileSpec->GetString());
   }
   if (wsFileName[0] != '/') {
     return ChangeSlash(wsFileName.c_str());
   }
   if (wsFileName[2] == '/') {
     CFX_WideString result;
     result += wsFileName[1];
     result += ':';
     result += ChangeSlash(wsFileName.c_str() + 2);
     return result;
   }
   CFX_WideString result;
   result += '\\';
   result += ChangeSlash(wsFileName.c_str());
   return result;
 }