commit d69b2e8c6ef406b9bc5617794b3337792e8a91d1
author Tom Sepez <tsepez@chromium.org> Tue Aug 17 01:49:00 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 17 01:49:00 2021 +0000
tree 910f41ebdb8fd920545c868455342d402a3e9867
parent 4f8e7e3f8b4587d4c34a4c0d59a8fa10f525abbb

Convert CXFA_ImageRenderer::m_State to an enum class

Similar to, but not the same as, the CL at
  https://pdfium-review.googlesource.com/c/pdfium/+/84192

-- shuffle a bit to put pointers together.

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

xfa/fxfa/cxfa_imagerenderer.cpp

diff --git a/xfa/fxfa/cxfa_imagerenderer.cpp b/xfa/fxfa/cxfa_imagerenderer.cpp
index 5117670..f280f8d 100644
--- a/xfa/fxfa/cxfa_imagerenderer.cpp
+++ b/xfa/fxfa/cxfa_imagerenderer.cpp
@@ -17,7 +17,7 @@
 CXFA_ImageRenderer::CXFA_ImageRenderer(CFX_RenderDevice* pDevice,
                                        const RetainPtr<CFX_DIBBase>& pDIBBase,
                                        const CFX_Matrix& pImage2Device)
-    : m_pDevice(pDevice), m_ImageMatrix(pImage2Device), m_pDIBBase(pDIBBase) {}
+    : m_ImageMatrix(pImage2Device), m_pDevice(pDevice), m_pDIBBase(pDIBBase) {}
 
 CXFA_ImageRenderer::~CXFA_ImageRenderer() = default;
 
@@ -27,7 +27,7 @@
   if (m_pDevice->StartDIBits(m_pDIBBase, 255, 0, m_ImageMatrix, options,
                              &m_DeviceHandle)) {
     if (m_DeviceHandle) {
-      m_Status = 3;
+      m_State = State::kStarted;
       return true;
     }
     return false;
@@ -50,7 +50,7 @@
     }
     FX_RECT clip_box = m_pDevice->GetClipBox();
     clip_box.Intersect(image_rect);
-    m_Status = 2;
+    m_State = State::kTransforming;
     m_pTransformer = std::make_unique<CFX_ImageTransformer>(pDib, m_ImageMatrix,
                                                             options, &clip_box);
     return true;
@@ -91,7 +91,7 @@
 }
 
 bool CXFA_ImageRenderer::Continue() {
-  if (m_Status == 2) {
+  if (m_State == State::kTransforming) {
     if (m_pTransformer->Continue(nullptr))
       return true;
 
@@ -109,7 +109,7 @@
     }
     return false;
   }
-  if (m_Status == 3)
+  if (m_State == State::kStarted)
     return m_pDevice->ContinueDIBits(m_DeviceHandle.get(), nullptr);
 
   return false;

xfa/fxfa/cxfa_imagerenderer.h

diff --git a/xfa/fxfa/cxfa_imagerenderer.h b/xfa/fxfa/cxfa_imagerenderer.h
index 5d830bf..8880a1e 100644
--- a/xfa/fxfa/cxfa_imagerenderer.h
+++ b/xfa/fxfa/cxfa_imagerenderer.h
@@ -30,13 +30,15 @@
   bool Continue();
 
  private:
+  enum class State : uint8_t { kInitial = 0, kTransforming, kStarted };
+
   void CompositeDIBitmap(const RetainPtr<CFX_DIBitmap>& pDIBitmap,
                          int left,
                          int top);
 
-  UnownedPtr<CFX_RenderDevice> m_pDevice;
-  int m_Status = 0;
+  State m_State = State::kInitial;
   CFX_Matrix m_ImageMatrix;
+  UnownedPtr<CFX_RenderDevice> m_pDevice;
   RetainPtr<CFX_DIBBase> m_pDIBBase;
   RetainPtr<CFX_DIBitmap> m_pCloneConvert;
   std::unique_ptr<CFX_ImageTransformer> m_pTransformer;