commit 059b514c280272d7d99c481b0d73e962d39421b6
author Tom Sepez <tsepez@chromium.org> Thu Mar 21 17:13:28 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Mar 21 17:13:28 2019 +0000
tree d34b8469550adcd6b5dd259669a95a2293d8eb79
parent f421410912993be4dffe3149653a5ffa0a7eff9f

Remove CPFDXFA_Context::GetXFAApp()

It is only called in one place inside the class itself. Also remove a
NULL check as the app is always created by the constructor, and mark as
const.

Change-Id: If867547d989efe87ce3789d496fd8cc3895d2833
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/52150
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

fpdfsdk/fpdfxfa/cpdfxfa_context.cpp

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
index 4290aa2..8af985f 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
@@ -102,12 +102,8 @@
 bool CPDFXFA_Context::LoadXFADoc() {
   m_nLoadStatus = FXFA_LOADSTATUS_LOADING;
   m_XFAPageList.clear();
-
-  CXFA_FFApp* pApp = GetXFAApp();
-  if (!pApp)
-    return false;
-
-  m_pXFADoc = CXFA_FFDoc::CreateAndOpen(pApp, &m_DocEnv, m_pPDFDoc.Get());
+  m_pXFADoc =
+      CXFA_FFDoc::CreateAndOpen(m_pXFAApp.get(), &m_DocEnv, m_pPDFDoc.Get());
   if (!m_pXFADoc) {
     SetLastError(FPDF_ERR_XFALOAD);
     return false;

fpdfsdk/fpdfxfa/cpdfxfa_context.h

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.h b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
index 92592a2..f434b8c 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
@@ -47,7 +47,6 @@
     return m_FormType == FormType::kXFAFull ||
            m_FormType == FormType::kXFAForeground;
   }
-  CXFA_FFApp* GetXFAApp() { return m_pXFAApp.get(); }
 
   CPDFSDK_FormFillEnvironment* GetFormFillEnv() const {
     return m_pFormFillEnv.Get();
@@ -115,7 +114,7 @@
   std::unique_ptr<CXFA_FFDoc> m_pXFADoc;
   Observable<CPDFSDK_FormFillEnvironment>::ObservedPtr m_pFormFillEnv;
   UnownedPtr<CXFA_FFDocView> m_pXFADocView;
-  std::unique_ptr<CXFA_FFApp> m_pXFAApp;
+  std::unique_ptr<CXFA_FFApp> const m_pXFAApp;
   std::unique_ptr<CJS_Runtime> m_pRuntime;
   std::vector<RetainPtr<CPDFXFA_Page>> m_XFAPageList;
   LoadStatus m_nLoadStatus = FXFA_LOADSTATUS_PRELOAD;