From ecf14f7caac3b5d79a3cc36b30d7bb97aabbb062 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Thu, 25 Oct 2018 17:25:13 +0000
Subject: Initialize CFX_ImageRenderer members in the header.

- Reorder to pack a bit better.
- Remove |m_BlendType| which is always |FXDIB_BLEND_NORMAL|.
- Change the ctor to pass the matrix by reference.

Change-Id: I07870947915fd2c90f28502803eb17f18204ac92
Reviewed-on: https://pdfium-review.googlesource.com/c/44547
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
---
 core/fxge/dib/cfx_imagerenderer.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'core/fxge/dib/cfx_imagerenderer.h')

diff --git a/core/fxge/dib/cfx_imagerenderer.h b/core/fxge/dib/cfx_imagerenderer.h
index 10dca178bf..2a16d2d18b 100644
--- a/core/fxge/dib/cfx_imagerenderer.h
+++ b/core/fxge/dib/cfx_imagerenderer.h
@@ -27,7 +27,7 @@ class CFX_ImageRenderer {
                     const RetainPtr<CFX_DIBBase>& pSource,
                     int bitmap_alpha,
                     uint32_t mask_color,
-                    const CFX_Matrix* pMatrix,
+                    const CFX_Matrix& matrix,
                     uint32_t dib_flags,
                     bool bRgbByteOrder);
   ~CFX_ImageRenderer();
@@ -38,16 +38,15 @@ class CFX_ImageRenderer {
   RetainPtr<CFX_DIBitmap> const m_pDevice;
   UnownedPtr<const CFX_ClipRgn> const m_pClipRgn;
   const CFX_Matrix m_Matrix;
-  const int m_BitmapAlpha;
-  const int m_BlendType;
-  const bool m_bRgbByteOrder;
-  uint32_t m_MaskColor;
   std::unique_ptr<CFX_ImageTransformer> m_pTransformer;
   std::unique_ptr<CFX_ImageStretcher> m_Stretcher;
   CFX_BitmapComposer m_Composer;
-  int m_Status;
   FX_RECT m_ClipBox;
-  int m_AlphaFlag;
+  const int m_BitmapAlpha;
+  int m_Status = 0;
+  int m_AlphaFlag = 0;
+  uint32_t m_MaskColor;
+  const bool m_bRgbByteOrder;
 };
 
 #endif  // CORE_FXGE_DIB_CFX_IMAGERENDERER_H_
-- 
cgit v1.2.3