From 6aac8a822ef227b80173f23ea3169b28a6712bba Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Wed, 8 Jun 2016 14:17:24 -0700
Subject: Remove even more const casting from core.

Make the return types/arguments match reality.

Review-Url: https://codereview.chromium.org/2053483002
---
 core/fpdfdoc/doc_form.cpp       | 7 +++----
 core/fpdfdoc/doc_utils.cpp      | 4 ++--
 core/fpdfdoc/include/fpdf_doc.h | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'core/fpdfdoc')

diff --git a/core/fpdfdoc/doc_form.cpp b/core/fpdfdoc/doc_form.cpp
index 25a9f0b72d..b2c5d8cdf7 100644
--- a/core/fpdfdoc/doc_form.cpp
+++ b/core/fpdfdoc/doc_form.cpp
@@ -989,16 +989,15 @@ CPDF_FormField* CPDF_InterForm::AddTerminalField(CPDF_Dictionary* pFieldDict) {
   }
   return pField;
 }
-CPDF_FormControl* CPDF_InterForm::AddControl(const CPDF_FormField* pField,
+CPDF_FormControl* CPDF_InterForm::AddControl(CPDF_FormField* pField,
                                              CPDF_Dictionary* pWidgetDict) {
   const auto it = m_ControlMap.find(pWidgetDict);
   if (it != m_ControlMap.end())
     return it->second;
 
-  CPDF_FormControl* pControl =
-      new CPDF_FormControl((CPDF_FormField*)pField, pWidgetDict);
+  CPDF_FormControl* pControl = new CPDF_FormControl(pField, pWidgetDict);
   m_ControlMap[pWidgetDict] = pControl;
-  ((CPDF_FormField*)pField)->m_ControlList.Add(pControl);
+  pField->m_ControlList.Add(pControl);
   return pControl;
 }
 
diff --git a/core/fpdfdoc/doc_utils.cpp b/core/fpdfdoc/doc_utils.cpp
index 05197380a6..ccef7feb57 100644
--- a/core/fpdfdoc/doc_utils.cpp
+++ b/core/fpdfdoc/doc_utils.cpp
@@ -467,7 +467,7 @@ CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict,
     if (!pFind) {
       continue;
     }
-    CFX_SubstFont* pSubst = (CFX_SubstFont*)pFind->GetSubstFont();
+    CFX_SubstFont* pSubst = pFind->GetSubstFont();
     if (!pSubst) {
       continue;
     }
@@ -486,7 +486,7 @@ CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict,
   CFX_SubstFont* pSubst;
   CPDF_Font* pFont = GetDefaultInterFormFont(pFormDict, pDocument);
   if (pFont) {
-    pSubst = (CFX_SubstFont*)pFont->GetSubstFont();
+    pSubst = pFont->GetSubstFont();
     if (pSubst && pSubst->m_Charset == (int)charSet) {
       FindInterFormFont(pFormDict, pFont, csNameTag);
       return pFont;
diff --git a/core/fpdfdoc/include/fpdf_doc.h b/core/fpdfdoc/include/fpdf_doc.h
index 0f65ee02b6..2722003743 100644
--- a/core/fpdfdoc/include/fpdf_doc.h
+++ b/core/fpdfdoc/include/fpdf_doc.h
@@ -533,7 +533,7 @@ class CPDF_InterForm {
   void LoadField(CPDF_Dictionary* pFieldDict, int nLevel = 0);
   CPDF_Object* GetFieldAttr(CPDF_Dictionary* pFieldDict, const FX_CHAR* name);
   CPDF_FormField* AddTerminalField(CPDF_Dictionary* pFieldDict);
-  CPDF_FormControl* AddControl(const CPDF_FormField* pField,
+  CPDF_FormControl* AddControl(CPDF_FormField* pField,
                                CPDF_Dictionary* pWidgetDict);
   void FDF_ImportField(CPDF_Dictionary* pField,
                        const CFX_WideString& parent_name,
-- 
cgit v1.2.3