commit 50985a0de703d2eec87666956f2bd9081d6f4268
author Tom Sepez <tsepez@chromium.org> Mon Sep 13 18:25:19 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Sep 13 18:25:19 2021 +0000
tree 5f297d7071e5436c9c421765839116db36e2e813
parent 7b17fcc23b2c99e7db162946dc783ef805e6cae3

Create CFFL_InteractiveFormFiller in CPDFSDK_FormFillEnvironment ctor.

Makes reasoning about the permanent 1:1 relationship between the two
objects much more obvious. Passing a partially-initialized `this` to
the CFFL_InteractiveFormFiller is fine, since all that constructor does
is stash away a pointer.

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

fpdfsdk/cpdfsdk_formfillenvironment.cpp

diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index f299d7f..ad7b349 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -61,7 +61,9 @@
     std::unique_ptr<CPDFSDK_AnnotHandlerMgr> pHandlerMgr)
     : m_pInfo(pFFinfo),
       m_pCPDFDoc(pDoc),
-      m_pAnnotHandlerMgr(std::move(pHandlerMgr)) {
+      m_pAnnotHandlerMgr(std::move(pHandlerMgr)),
+      m_pInteractiveFormFiller(
+          std::make_unique<CFFL_InteractiveFormFiller>(this)) {
   DCHECK(m_pCPDFDoc);
   m_pAnnotHandlerMgr->SetFormFillEnv(this);
 }
@@ -357,15 +359,6 @@
   return m_pActionHandler.get();
 }
 
-CFFL_InteractiveFormFiller*
-CPDFSDK_FormFillEnvironment::GetInteractiveFormFiller() {
-  if (!m_pInteractiveFormFiller) {
-    m_pInteractiveFormFiller =
-        std::make_unique<CFFL_InteractiveFormFiller>(this);
-  }
-  return m_pInteractiveFormFiller.get();
-}
-
 void CPDFSDK_FormFillEnvironment::Invalidate(IPDF_Page* page,
                                              const FX_RECT& rect) {
   if (m_pInfo && m_pInfo->FFI_Invalidate) {