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 .

2 files changed, 41 insertions, 39 deletions

diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index ca4bb51fda..0478acc3e0 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -256,21 +256,21 @@ class CPDF_Array : public CPDF_Object {
 
   CFX_FloatRect GetRect();
 
-  CFX_ByteString GetString(FX_DWORD index) const;
+  CFX_ByteString GetStringAt(FX_DWORD index) const;
 
-  CFX_ByteStringC GetConstString(FX_DWORD index) const;
+  CFX_ByteStringC GetConstStringAt(FX_DWORD index) const;
 
-  int GetInteger(FX_DWORD index) const;
+  int GetIntegerAt(FX_DWORD index) const;
 
-  FX_FLOAT GetNumber(FX_DWORD index) const;
+  FX_FLOAT GetNumberAt(FX_DWORD index) const;
 
-  CPDF_Dictionary* GetDict(FX_DWORD index) const;
+  CPDF_Dictionary* GetDictAt(FX_DWORD index) const;
 
-  CPDF_Stream* GetStream(FX_DWORD index) const;
+  CPDF_Stream* GetStreamAt(FX_DWORD index) const;
 
-  CPDF_Array* GetArray(FX_DWORD index) const;
+  CPDF_Array* GetArrayAt(FX_DWORD index) const;
 
-  FX_FLOAT GetFloat(FX_DWORD index) const { return GetNumber(index); }
+  FX_FLOAT GetFloatAt(FX_DWORD index) const { return GetNumberAt(index); }
 
   void SetAt(FX_DWORD index,
              CPDF_Object* pObj,
@@ -298,7 +298,7 @@ class CPDF_Array : public CPDF_Object {
     AddReference(pDoc, obj->GetObjNum());
   }
 
-  FX_FLOAT GetNumber16(FX_DWORD index) const { return GetNumber(index); }
+  FX_FLOAT GetNumber16(FX_DWORD index) const { return GetNumberAt(index); }
 
   void AddNumber16(FX_FLOAT value) { AddNumber(value); }
 
@@ -328,39 +328,41 @@ class CPDF_Dictionary : public CPDF_Object {
 
   CPDF_Object* GetElementValue(const CFX_ByteStringC& key) const;
 
-  CFX_ByteString GetString(const CFX_ByteStringC& key) const;
+  CFX_ByteString GetStringBy(const CFX_ByteStringC& key) const;
 
-  CFX_ByteStringC GetConstString(const CFX_ByteStringC& key) const;
+  CFX_ByteStringC GetConstStringBy(const CFX_ByteStringC& key) const;
 
-  CFX_ByteString GetString(const CFX_ByteStringC& key,
-                           const CFX_ByteStringC& default_str) const;
+  CFX_ByteString GetStringBy(const CFX_ByteStringC& key,
+                             const CFX_ByteStringC& default_str) const;
 
-  CFX_ByteStringC GetConstString(const CFX_ByteStringC& key,
-                                 const CFX_ByteStringC& default_str) const;
+  CFX_ByteStringC GetConstStringBy(const CFX_ByteStringC& key,
+                                   const CFX_ByteStringC& default_str) const;
 
-  CFX_WideString GetUnicodeText(const CFX_ByteStringC& key,
-                                CFX_CharMap* pCharMap = NULL) const;
+  CFX_WideString GetUnicodeTextBy(const CFX_ByteStringC& key,
+                                  CFX_CharMap* pCharMap = NULL) const;
 
-  int GetInteger(const CFX_ByteStringC& key) const;
+  int GetIntegerBy(const CFX_ByteStringC& key) const;
 
-  int GetInteger(const CFX_ByteStringC& key, int default_int) const;
+  int GetIntegerBy(const CFX_ByteStringC& key, int default_int) const;
 
-  FX_BOOL GetBoolean(const CFX_ByteStringC& key,
-                     FX_BOOL bDefault = FALSE) const;
+  FX_BOOL GetBooleanBy(const CFX_ByteStringC& key,
+                       FX_BOOL bDefault = FALSE) const;
 
-  FX_FLOAT GetNumber(const CFX_ByteStringC& key) const;
+  FX_FLOAT GetNumberBy(const CFX_ByteStringC& key) const;
 
-  CPDF_Dictionary* GetDict(const CFX_ByteStringC& key) const;
+  CPDF_Dictionary* GetDictBy(const CFX_ByteStringC& key) const;
 
-  CPDF_Stream* GetStream(const CFX_ByteStringC& key) const;
+  CPDF_Stream* GetStreamBy(const CFX_ByteStringC& key) const;
 
-  CPDF_Array* GetArray(const CFX_ByteStringC& key) const;
+  CPDF_Array* GetArrayBy(const CFX_ByteStringC& key) const;
 
-  CFX_FloatRect GetRect(const CFX_ByteStringC& key) const;
+  CFX_FloatRect GetRectBy(const CFX_ByteStringC& key) const;
 
-  CFX_Matrix GetMatrix(const CFX_ByteStringC& key) const;
+  CFX_Matrix GetMatrixBy(const CFX_ByteStringC& key) const;
 
-  FX_FLOAT GetFloat(const CFX_ByteStringC& key) const { return GetNumber(key); }
+  FX_FLOAT GetFloatBy(const CFX_ByteStringC& key) const {
+    return GetNumberBy(key);
+  }
 
   FX_BOOL KeyExist(const CFX_ByteStringC& key) const;
 
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 7a6dd4fcd4..97d7391cd0 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -218,7 +218,7 @@ class CPDF_Action {
 
   CPDF_Dictionary* GetDict() const { return m_pDict; }
 
-  CFX_ByteString GetTypeName() const { return m_pDict->GetString("S"); }
+  CFX_ByteString GetTypeName() const { return m_pDict->GetStringBy("S"); }
 
   ActionType GetType() const;
 
@@ -226,19 +226,19 @@ class CPDF_Action {
 
   CFX_WideString GetFilePath() const;
 
-  FX_BOOL GetNewWindow() const { return m_pDict->GetBoolean("NewWindow"); }
+  FX_BOOL GetNewWindow() const { return m_pDict->GetBooleanBy("NewWindow"); }
 
   CFX_ByteString GetURI(CPDF_Document* pDoc) const;
 
-  FX_BOOL GetMouseMap() const { return m_pDict->GetBoolean("IsMap"); }
+  FX_BOOL GetMouseMap() const { return m_pDict->GetBooleanBy("IsMap"); }
 
   CPDF_ActionFields GetWidgets() const { return this; }
 
-  FX_BOOL GetHideStatus() const { return m_pDict->GetBoolean("H", TRUE); }
+  FX_BOOL GetHideStatus() const { return m_pDict->GetBooleanBy("H", TRUE); }
 
-  CFX_ByteString GetNamedAction() const { return m_pDict->GetString("N"); }
+  CFX_ByteString GetNamedAction() const { return m_pDict->GetStringBy("N"); }
 
-  FX_DWORD GetFlags() const { return m_pDict->GetInteger("Flags"); }
+  FX_DWORD GetFlags() const { return m_pDict->GetIntegerBy("Flags"); }
 
   CFX_WideString GetJavaScript() const;
 
@@ -246,15 +246,15 @@ class CPDF_Action {
 
   int32_t GetOperationType() const;
 
-  CPDF_Stream* GetSoundStream() const { return m_pDict->GetStream("Sound"); }
+  CPDF_Stream* GetSoundStream() const { return m_pDict->GetStreamBy("Sound"); }
 
-  FX_FLOAT GetVolume() const { return m_pDict->GetNumber("Volume"); }
+  FX_FLOAT GetVolume() const { return m_pDict->GetNumberBy("Volume"); }
 
-  FX_BOOL IsSynchronous() const { return m_pDict->GetBoolean("Synchronous"); }
+  FX_BOOL IsSynchronous() const { return m_pDict->GetBooleanBy("Synchronous"); }
 
-  FX_BOOL IsRepeat() const { return m_pDict->GetBoolean("Repeat"); }
+  FX_BOOL IsRepeat() const { return m_pDict->GetBooleanBy("Repeat"); }
 
-  FX_BOOL IsMixPlay() const { return m_pDict->GetBoolean("Mix"); }
+  FX_BOOL IsMixPlay() const { return m_pDict->GetBooleanBy("Mix"); }
 
   FX_DWORD GetSubActionsCount() const;