commit 803ecc84316a55e04c85b85c0657cc1add804323
author Tom Sepez <tsepez@chromium.org> Mon Aug 23 21:53:19 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 23 21:53:19 2021 +0000
tree 10d698975ab91d217bb44fdf4ef772b3287a5499
parent 646eac752078a826a470e62d718cb5190572fd5a

Make LoadStatus a nested enum class.

One less top-level definition.

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

fpdfsdk/fpdfxfa/cpdfxfa_context.cpp

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
index d3707e5..35d33db 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
@@ -112,7 +112,7 @@
 }
 
 CPDFXFA_Context::~CPDFXFA_Context() {
-  m_nLoadStatus = FXFA_LOADSTATUS_CLOSING;
+  m_nLoadStatus = LoadStatus::kClosing;
   if (m_pFormFillEnv)
     m_pFormFillEnv->ClearAllFocusedAnnots();
 }
@@ -133,7 +133,7 @@
 }
 
 bool CPDFXFA_Context::LoadXFADoc() {
-  m_nLoadStatus = FXFA_LOADSTATUS_LOADING;
+  m_nLoadStatus = LoadStatus::kLoading;
   m_XFAPageList.clear();
 
   CJS_Runtime* actual_runtime = GetCJSRuntime();  // Null if a stub.
@@ -191,7 +191,7 @@
 
   view_nuller.AbandonNullification();
   doc_nuller.AbandonNullification();
-  m_nLoadStatus = FXFA_LOADSTATUS_LOADED;
+  m_nLoadStatus = LoadStatus::kLoaded;
   return true;
 }
 
@@ -324,7 +324,7 @@
                                 const WideString& wsTitle,
                                 uint32_t dwIconType,
                                 uint32_t dwButtonType) {
-  if (!m_pFormFillEnv || m_nLoadStatus != FXFA_LOADSTATUS_LOADED)
+  if (!m_pFormFillEnv || m_nLoadStatus != LoadStatus::kLoaded)
     return -1;
 
   int iconType =

fpdfsdk/fpdfxfa/cpdfxfa_context.h

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.h b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
index ac00edf..d3c6d6c 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
@@ -28,13 +28,6 @@
 class CJS_Runtime;
 class CPDFXFA_DocEnvironment;
 
-enum LoadStatus {
-  FXFA_LOADSTATUS_PRELOAD = 0,
-  FXFA_LOADSTATUS_LOADING,
-  FXFA_LOADSTATUS_LOADED,
-  FXFA_LOADSTATUS_CLOSING,
-};
-
 // Per-process initializations.
 void CPDFXFA_ModuleInit();
 void CPDFXFA_ModuleDestroy();
@@ -42,6 +35,13 @@
 class CPDFXFA_Context final : public CPDF_Document::Extension,
                               public CXFA_FFApp::CallbackIface {
  public:
+  enum class LoadStatus : uint8_t {
+    kPreload = 0,
+    kLoading,
+    kLoaded,
+    kClosing,
+  };
+
   explicit CPDFXFA_Context(CPDF_Document* pPDFDoc);
   ~CPDFXFA_Context() override;
 
@@ -115,7 +115,7 @@
                    XFA_HashCode code);
 
   FormType m_FormType = FormType::kNone;
-  LoadStatus m_nLoadStatus = FXFA_LOADSTATUS_PRELOAD;
+  LoadStatus m_nLoadStatus = LoadStatus::kPreload;
   int m_nPageCount = 0;
 
   // The order in which the following members are destroyed is critical.

fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
index f4d5fea..2814217 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
@@ -285,8 +285,8 @@
   if (!pFormFillEnv)
     return;
 
-  if (m_pContext->GetLoadStatus() == FXFA_LOADSTATUS_LOADING ||
-      m_pContext->GetLoadStatus() == FXFA_LOADSTATUS_CLOSING ||
+  if (m_pContext->GetLoadStatus() == CPDFXFA_Context::LoadStatus::kLoading ||
+      m_pContext->GetLoadStatus() == CPDFXFA_Context::LoadStatus::kClosing ||
       eEvent != CXFA_FFDoc::PageViewEvent::kStopLayout) {
     return;
   }