2 files changed, 10 insertions, 40 deletions

diff --git a/core/fpdfdoc/cpdf_filespec.cpp b/core/fpdfdoc/cpdf_filespec.cpp
index 95254b7bb8..2cc51e33d3 100644
--- a/core/fpdfdoc/cpdf_filespec.cpp
+++ b/core/fpdfdoc/cpdf_filespec.cpp
@@ -19,10 +19,6 @@
 
 namespace {
 
-// List of keys to check for the file specification string.
-// Follows the same precedence order as GetFileName().
-constexpr const char* kKeys[] = {"UF", "F", "DOS", "Mac", "Unix"};
-
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ || \
     _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
 WideString ChangeSlashToPlatform(const wchar_t* str) {
@@ -136,6 +132,9 @@ const CPDF_Stream* CPDF_FileSpec::GetFileStream() const {
   if (!pFiles)
     return nullptr;
 
+  // List of keys to check for the file specification string.
+  // Follows the same precedence order as GetFileName().
+  constexpr const char* kKeys[] = {"UF", "F", "DOS", "Mac", "Unix"};
   size_t end = pDict->GetStringFor("FS") == "URL" ? 2 : FX_ArraySize(kKeys);
   for (size_t i = 0; i < end; ++i) {
     ByteString key = kKeys[i];
@@ -149,25 +148,8 @@ const CPDF_Stream* CPDF_FileSpec::GetFileStream() const {
 }
 
 CPDF_Stream* CPDF_FileSpec::GetFileStream() {
-  CPDF_Dictionary* pDict = m_pWritableObj->AsDictionary();
-  if (!pDict)
-    return nullptr;
-
-  // Get the embedded files dictionary.
-  CPDF_Dictionary* pFiles = pDict->GetDictFor("EF");
-  if (!pFiles)
-    return nullptr;
-
-  size_t end = pDict->GetStringFor("FS") == "URL" ? 2 : FX_ArraySize(kKeys);
-  for (size_t i = 0; i < end; ++i) {
-    ByteString key = kKeys[i];
-    if (!pDict->GetUnicodeTextFor(key).IsEmpty()) {
-      CPDF_Stream* pStream = pFiles->GetStreamFor(key);
-      if (pStream)
-        return pStream;
-    }
-  }
-  return nullptr;
+  return const_cast<CPDF_Stream*>(
+      static_cast<const CPDF_FileSpec*>(this)->GetFileStream());
 }
 
 const CPDF_Dictionary* CPDF_FileSpec::GetParamsDict() const {
@@ -180,12 +162,8 @@ const CPDF_Dictionary* CPDF_FileSpec::GetParamsDict() const {
 }
 
 CPDF_Dictionary* CPDF_FileSpec::GetParamsDict() {
-  CPDF_Stream* pStream = GetFileStream();
-  if (!pStream)
-    return nullptr;
-
-  CPDF_Dictionary* pDict = pStream->GetDict();
-  return pDict ? pDict->GetDictFor("Params") : nullptr;
+  return const_cast<CPDF_Dictionary*>(
+      static_cast<const CPDF_FileSpec*>(this)->GetParamsDict());
 }
 
 WideString CPDF_FileSpec::EncodeFileName(const WideString& filepath) {
diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp
index 2f05ad8732..c88513d50f 100644
--- a/core/fpdfdoc/cpdf_formfield.cpp
+++ b/core/fpdfdoc/cpdf_formfield.cpp
@@ -37,8 +37,6 @@ const int kFormTextPassword = 0x200;
 const int kFormTextNoScroll = 0x400;
 const int kFormTextComb = 0x800;
 
-constexpr int kGetFieldMaxRecursion = 32;
-
 bool IsUnison(CPDF_FormField* pField) {
   if (pField->GetType() == CPDF_FormField::CheckBox)
     return true;
@@ -58,6 +56,7 @@ Optional<FormFieldType> IntToFormFieldType(int value) {
 const CPDF_Object* FPDF_GetFieldAttr(const CPDF_Dictionary* pFieldDict,
                                      const char* name,
                                      int nLevel) {
+  static constexpr int kGetFieldMaxRecursion = 32;
   if (!pFieldDict || nLevel > kGetFieldMaxRecursion)
     return nullptr;
 
@@ -72,15 +71,8 @@ const CPDF_Object* FPDF_GetFieldAttr(const CPDF_Dictionary* pFieldDict,
 CPDF_Object* FPDF_GetFieldAttr(CPDF_Dictionary* pFieldDict,
                                const char* name,
                                int nLevel) {
-  if (!pFieldDict || nLevel > kGetFieldMaxRecursion)
-    return nullptr;
-
-  CPDF_Object* pAttr = pFieldDict->GetDirectObjectFor(name);
-  if (pAttr)
-    return pAttr;
-
-  CPDF_Dictionary* pParent = pFieldDict->GetDictFor("Parent");
-  return pParent ? FPDF_GetFieldAttr(pParent, name, nLevel + 1) : nullptr;
+  return const_cast<CPDF_Object*>(FPDF_GetFieldAttr(
+      static_cast<const CPDF_Dictionary*>(pFieldDict), name, nLevel));
 }
 
 WideString FPDF_GetFullName(CPDF_Dictionary* pFieldDict) {