commit 8da2c7c57e3a0b41fb20d7d82aab1a16a0792702
author Tom Sepez <tsepez@chromium.org> Tue Aug 17 00:00:09 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 17 00:00:09 2021 +0000
tree 1603a74721956cc8454b1b8ac05b78e1ad107814
parent 17eeb78682c3a0b386c462805282c4920a827955

Replace CFX_ImageRenderer::m_Status with an enum class

-- Introduce symbolic names for states
-- Shuffle a bit to pack tighter

Change-Id: Ie37799daf3abb8980801972a1c210b633f3eb2ae
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/84192
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/dib/cfx_imagerenderer.cpp

diff --git a/core/fxge/dib/cfx_imagerenderer.cpp b/core/fxge/dib/cfx_imagerenderer.cpp
index 35543d9..ee03e54 100644
--- a/core/fxge/dib/cfx_imagerenderer.cpp
+++ b/core/fxge/dib/cfx_imagerenderer.cpp
@@ -54,10 +54,10 @@
       m_Stretcher = std::make_unique<CFX_ImageStretcher>(
           &m_Composer, pSource, dest_height, dest_width, bitmap_clip, options);
       if (m_Stretcher->Start())
-        m_Status = 1;
+        m_State = State::kStretching;
       return;
     }
-    m_Status = 2;
+    m_State = State::kTransforming;
     m_pTransformer = std::make_unique<CFX_ImageTransformer>(
         pSource, m_Matrix, options, &m_ClipBox);
     return;
@@ -78,7 +78,7 @@
   bitmap_clip.Offset(-image_rect.left, -image_rect.top);
   m_Composer.Compose(pDevice, pClipRgn, bitmap_alpha, mask_color, m_ClipBox,
                      false, false, false, m_bRgbByteOrder, BlendMode::kNormal);
-  m_Status = 1;
+  m_State = State::kStretching;
   m_Stretcher = std::make_unique<CFX_ImageStretcher>(
       &m_Composer, pSource, dest_width, dest_height, bitmap_clip, options);
   m_Stretcher->Start();
@@ -87,9 +87,9 @@
 CFX_ImageRenderer::~CFX_ImageRenderer() = default;
 
 bool CFX_ImageRenderer::Continue(PauseIndicatorIface* pPause) {
-  if (m_Status == 1)
+  if (m_State == State::kStretching)
     return m_Stretcher->Continue(pPause);
-  if (m_Status != 2)
+  if (m_State != State::kTransforming)
     return false;
   if (m_pTransformer->Continue(pPause))
     return true;

core/fxge/dib/cfx_imagerenderer.h

diff --git a/core/fxge/dib/cfx_imagerenderer.h b/core/fxge/dib/cfx_imagerenderer.h
index a64fd4a..30c0c94 100644
--- a/core/fxge/dib/cfx_imagerenderer.h
+++ b/core/fxge/dib/cfx_imagerenderer.h
@@ -35,6 +35,8 @@
   bool Continue(PauseIndicatorIface* pPause);
 
  private:
+  enum class State : uint8_t { kInitial = 0, kStretching, kTransforming };
+
   RetainPtr<CFX_DIBitmap> const m_pDevice;
   UnownedPtr<const CFX_ClipRgn> const m_pClipRgn;
   const CFX_Matrix m_Matrix;
@@ -43,8 +45,8 @@
   CFX_BitmapComposer m_Composer;
   FX_RECT m_ClipBox;
   const int m_BitmapAlpha;
-  int m_Status = 0;
   uint32_t m_MaskColor;
+  State m_State = State::kInitial;
   const bool m_bRgbByteOrder;
 };