Rename GetElementValue() to GetDirectObject{By,At}().

core/fpdfdoc/doc_action.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 <vector>
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
@@ skipping 14 matching lines @@
 }  // namespace
 
 CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const {
   if (!m_pDict) {
     return CPDF_Dest();
   }
   CFX_ByteString type = m_pDict->GetStringBy("S");
   if (type != "GoTo" && type != "GoToR") {
     return CPDF_Dest();
   }
-  CPDF_Object* pDest = m_pDict->GetElementValue("D");
+  CPDF_Object* pDest = m_pDict->GetDirectObjectBy("D");
   if (!pDest) {
     return CPDF_Dest();
   }
   if (pDest->IsString() || pDest->IsName()) {
     CPDF_NameTree name_tree(pDoc, "Dests");
     CFX_ByteStringC name = pDest->GetString();
     return CPDF_Dest(name_tree.LookupNamedDest(pDoc, name));
   }
   if (CPDF_Array* pArray = pDest->AsArray())
     return CPDF_Dest(pArray);
@@ skipping 14 matching lines @@
   }
   return Unknown;
 }
 
 CFX_WideString CPDF_Action::GetFilePath() const {
   CFX_ByteString type = m_pDict->GetStringBy("S");
   if (type != "GoToR" && type != "Launch" && type != "SubmitForm" &&
       type != "ImportData") {
     return CFX_WideString();
   }
-  CPDF_Object* pFile = m_pDict->GetElementValue("F");
+  CPDF_Object* pFile = m_pDict->GetDirectObjectBy("F");
   CFX_WideString path;
   if (!pFile) {
     if (type == "Launch") {
       CPDF_Dictionary* pWinDict = m_pDict->GetDictBy("Win");
       if (pWinDict) {
         return CFX_WideString::FromLocal(pWinDict->GetStringBy("F"));
       }
     }
     return path;
   }
@@ skipping 23 matching lines @@
   if (!m_pAction) {
     return 0;
   }
   CPDF_Dictionary* pDict = m_pAction->GetDict();
   if (!pDict) {
     return 0;
   }
   CFX_ByteString csType = pDict->GetStringBy("S");
   CPDF_Object* pFields = NULL;
   if (csType == "Hide") {
-    pFields = pDict->GetElementValue("T");
+    pFields = pDict->GetDirectObjectBy("T");
   } else {
     pFields = pDict->GetArrayBy("Fields");
   }
   if (!pFields)
     return 0;
   if (pFields->IsDictionary())
     return 1;
   if (pFields->IsString())
     return 1;
   if (CPDF_Array* pArray = pFields->AsArray())
     return pArray->GetCount();
   return 0;
 }
 
 std::vector<CPDF_Object*> CPDF_ActionFields::GetAllFields() const {
   std::vector<CPDF_Object*> fields;
   if (!m_pAction)
     return fields;
 
   CPDF_Dictionary* pDict = m_pAction->GetDict();
   if (!pDict)
     return fields;
 
   CFX_ByteString csType = pDict->GetStringBy("S");
   CPDF_Object* pFields;
   if (csType == "Hide")
-    pFields = pDict->GetElementValue("T");
+    pFields = pDict->GetDirectObjectBy("T");
   else
     pFields = pDict->GetArrayBy("Fields");
   if (!pFields)
     return fields;
 
   if (pFields->IsDictionary() || pFields->IsString()) {
     fields.push_back(pFields);
   } else if (CPDF_Array* pArray = pFields->AsArray()) {
     uint32_t iCount = pArray->GetCount();
     for (uint32_t i = 0; i < iCount; ++i) {
-      CPDF_Object* pObj = pArray->GetElementValue(i);
+      CPDF_Object* pObj = pArray->GetDirectObjectAt(i);
       if (pObj) {
         fields.push_back(pObj);
       }
     }
   }
   return fields;
 }
 
 CPDF_Object* CPDF_ActionFields::GetField(uint32_t iIndex) const {
   if (!m_pAction) {
     return NULL;
   }
   CPDF_Dictionary* pDict = m_pAction->GetDict();
   if (!pDict) {
     return NULL;
   }
   CFX_ByteString csType = pDict->GetStringBy("S");
   CPDF_Object* pFields = NULL;
   if (csType == "Hide") {
-    pFields = pDict->GetElementValue("T");
+    pFields = pDict->GetDirectObjectBy("T");
   } else {
     pFields = pDict->GetArrayBy("Fields");
   }
   if (!pFields) {
     return NULL;
   }
   CPDF_Object* pFindObj = NULL;
   if (pFields->IsDictionary() || pFields->IsString()) {
     if (iIndex == 0)
       pFindObj = pFields;
   } else if (CPDF_Array* pArray = pFields->AsArray()) {
-    pFindObj = pArray->GetElementValue(iIndex);
+    pFindObj = pArray->GetDirectObjectAt(iIndex);
   }
   return pFindObj;
 }
 
 CFX_WideString CPDF_Action::GetJavaScript() const {
   CFX_WideString csJS;
   if (!m_pDict) {
     return csJS;
   }
-  CPDF_Object* pJS = m_pDict->GetElementValue("JS");
+  CPDF_Object* pJS = m_pDict->GetDirectObjectBy("JS");
   return pJS ? pJS->GetUnicodeText() : csJS;
 }
 CPDF_Dictionary* CPDF_Action::GetAnnot() const {
   if (!m_pDict) {
     return nullptr;
   }
   CFX_ByteString csType = m_pDict->GetStringBy("S");
   if (csType == "Rendition") {
     return m_pDict->GetDictBy("AN");
   }
@@ skipping 24 matching lines @@
     if (csOP == "Resume") {
       return 3;
     }
   }
   return 0;
 }
 uint32_t CPDF_Action::GetSubActionsCount() const {
   if (!m_pDict || !m_pDict->KeyExist("Next"))
     return 0;
 
-  CPDF_Object* pNext = m_pDict->GetElementValue("Next");
+  CPDF_Object* pNext = m_pDict->GetDirectObjectBy("Next");
   if (!pNext)
     return 0;
   if (pNext->IsDictionary())
     return 1;
   if (CPDF_Array* pArray = pNext->AsArray())
     return pArray->GetCount();
   return 0;
 }
 CPDF_Action CPDF_Action::GetSubAction(uint32_t iIndex) const {
   if (!m_pDict || !m_pDict->KeyExist("Next")) {
     return CPDF_Action();
   }
-  CPDF_Object* pNext = m_pDict->GetElementValue("Next");
+  CPDF_Object* pNext = m_pDict->GetDirectObjectBy("Next");
   if (CPDF_Dictionary* pDict = ToDictionary(pNext)) {
     if (iIndex == 0)
       return CPDF_Action(pDict);
   } else if (CPDF_Array* pArray = ToArray(pNext)) {
     return CPDF_Action(pArray->GetDictAt(iIndex));
   }
   return CPDF_Action();
 }
 
 FX_BOOL CPDF_AAction::ActionExist(AActionType eType) const {
@@ skipping 31 matching lines @@
   if (!ToDictionary(pAction)) {
     return CPDF_Action();
   }
   return CPDF_Action(pAction->GetDict());
 }
 int CPDF_DocJSActions::FindJSAction(const CFX_ByteString& csName) const {
   ASSERT(m_pDocument);
   CPDF_NameTree name_tree(m_pDocument, "JavaScript");
   return name_tree.GetIndex(csName);
 }