From 9b76113ae4567eb998618d049afde26d3f0175d5 Mon Sep 17 00:00:00 2001
From: Wei Li <weili@chromium.org>
Date: Fri, 29 Jan 2016 15:44:20 -0800
Subject: Merge to XFA: Member function name refactoring

This is needed by Cl 1634373003 as the name collision with virtual functions
will be shown as warnings on Linux. Also, it is better to use
different names for different cases.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1644633003 .

(cherry picked from commit d45e7a51904164fb22049f0a7a80d2a94c06936b)

Review URL: https://codereview.chromium.org/1648233002 .
---
 xfa/src/fxfa/src/app/xfa_ffdoc.cpp   | 8 ++++----
 xfa/src/fxfa/src/app/xfa_fontmgr.cpp | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'xfa')

diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
index 9e232f1017..38901dde8a 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
@@ -225,7 +225,7 @@ FX_BOOL CXFA_FFDoc::OpenDoc(CPDF_Document* pPDFDoc) {
   if (pRoot == NULL) {
     return FALSE;
   }
-  CPDF_Dictionary* pAcroForm = pRoot->GetDict("AcroForm");
+  CPDF_Dictionary* pAcroForm = pRoot->GetDictBy("AcroForm");
   if (pAcroForm == NULL) {
     return FALSE;
   }
@@ -238,7 +238,7 @@ FX_BOOL CXFA_FFDoc::OpenDoc(CPDF_Document* pPDFDoc) {
     CPDF_Array* pXFAArray = (CPDF_Array*)pElementXFA;
     FX_DWORD count = pXFAArray->GetCount() / 2;
     for (FX_DWORD i = 0; i < count; i++) {
-      CPDF_Stream* pStream = pXFAArray->GetStream(i * 2 + 1);
+      CPDF_Stream* pStream = pXFAArray->GetStreamAt(i * 2 + 1);
       if (pStream != NULL) {
         xfaStreams.Add(pStream);
       }
@@ -334,11 +334,11 @@ CFX_DIBitmap* CXFA_FFDoc::GetPDFNamedImage(const CFX_WideStringC& wsName,
   if (pRoot == NULL) {
     return NULL;
   }
-  CPDF_Dictionary* pNames = pRoot->GetDict("Names");
+  CPDF_Dictionary* pNames = pRoot->GetDictBy("Names");
   if (!pNames) {
     return NULL;
   }
-  CPDF_Dictionary* pXFAImages = pNames->GetDict("XFAImages");
+  CPDF_Dictionary* pXFAImages = pNames->GetDictBy("XFAImages");
   if (!pXFAImages) {
     return NULL;
   }
diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
index 3bc03872df..57061deb1f 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
@@ -1854,11 +1854,11 @@ IFX_Font* CXFA_PDFFontMgr::FindFont(CFX_ByteString strPsName,
     return NULL;
   }
   CPDF_Dictionary* pFontSetDict =
-      pDoc->GetRoot()->GetDict("AcroForm")->GetDict("DR");
+      pDoc->GetRoot()->GetDictBy("AcroForm")->GetDictBy("DR");
   if (!pFontSetDict) {
     return NULL;
   }
-  pFontSetDict = (CPDF_Dictionary*)pFontSetDict->GetDict("Font");
+  pFontSetDict = (CPDF_Dictionary*)pFontSetDict->GetDictBy("Font");
   if (!pFontSetDict) {
     return NULL;
   }
@@ -1875,7 +1875,7 @@ IFX_Font* CXFA_PDFFontMgr::FindFont(CFX_ByteString strPsName,
       return NULL;
     }
     CPDF_Dictionary* pFontDict = (CPDF_Dictionary*)pDirect;
-    if (pFontDict->GetString("Type") != "Font") {
+    if (pFontDict->GetStringBy("Type") != "Font") {
       return NULL;
     }
     CPDF_Font* pPDFFont = pDoc->LoadFont(pFontDict);
-- 
cgit v1.2.3