Move Start to constructor in CFX_Image(Renderer|Transformer)chromium/3145

The bool returned by Start was not being used and the method was always
called right after the constructor, so it should be in the constructor.

Change-Id: I98abf9f7c11fbe42b3aa15ec5e46731198aa23d5
Reviewed-on: https://pdfium-review.googlesource.com/7151
Commit-Queue: Nicolás Peña <npm@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

1 files changed, 14 insertions, 17 deletions

diff --git a/core/fxge/dib/cfx_imagerenderer.h b/core/fxge/dib/cfx_imagerenderer.h
index cad621e19c..97427ceb91 100644
--- a/core/fxge/dib/cfx_imagerenderer.h
+++ b/core/fxge/dib/cfx_imagerenderer.h
@@ -23,35 +23,32 @@ class CFX_ImageStretcher;
 
 class CFX_ImageRenderer {
  public:
-  CFX_ImageRenderer();
+  CFX_ImageRenderer(const CFX_RetainPtr<CFX_DIBitmap>& pDevice,
+                    const CFX_ClipRgn* pClipRgn,
+                    const CFX_RetainPtr<CFX_DIBSource>& pSource,
+                    int bitmap_alpha,
+                    uint32_t mask_color,
+                    const CFX_Matrix* pMatrix,
+                    uint32_t dib_flags,
+                    bool bRgbByteOrder);
   ~CFX_ImageRenderer();
 
-  bool Start(const CFX_RetainPtr<CFX_DIBitmap>& pDevice,
-             const CFX_ClipRgn* pClipRgn,
-             const CFX_RetainPtr<CFX_DIBSource>& pSource,
-             int bitmap_alpha,
-             uint32_t mask_color,
-             const CFX_Matrix* pMatrix,
-             uint32_t dib_flags,
-             bool bRgbByteOrder);
-
   bool Continue(IFX_Pause* pPause);
 
  private:
-  CFX_RetainPtr<CFX_DIBitmap> m_pDevice;
-  CFX_UnownedPtr<const CFX_ClipRgn> m_pClipRgn;
-  int m_BitmapAlpha;
+  const CFX_RetainPtr<CFX_DIBitmap> m_pDevice;
+  const CFX_UnownedPtr<const CFX_ClipRgn> m_pClipRgn;
+  const CFX_Matrix m_Matrix;
+  const int m_BitmapAlpha;
+  const int m_BlendType;
+  const bool m_bRgbByteOrder;
   uint32_t m_MaskColor;
-  CFX_Matrix m_Matrix;
   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;
-  uint32_t m_Flags;
   int m_AlphaFlag;
-  bool m_bRgbByteOrder;
-  int m_BlendType;
 };
 
 #endif  // CORE_FXGE_DIB_CFX_IMAGERENDERER_H_