Clean up CFX_ImageTransformer.

core/fxge/include/fx_dib.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FXGE_INCLUDE_FX_DIB_H_
 #define CORE_FXGE_INCLUDE_FX_DIB_H_
 
 #include <memory>
@@ skipping 540 matching lines @@
 
 class CFX_BitmapStorer : public IFX_ScanlineComposer {
  public:
   CFX_BitmapStorer();
   ~CFX_BitmapStorer() override;
 
   // IFX_ScanlineComposer
   void ComposeScanline(int line,
                        const uint8_t* scanline,
                        const uint8_t* scan_extra_alpha) override;
-
   FX_BOOL SetInfo(int width,
                   int height,
                   FXDIB_Format src_format,
                   uint32_t* pSrcPalette) override;
 
-  CFX_DIBitmap* GetBitmap() { return m_pBitmap; }
-
-  CFX_DIBitmap* Detach();
-
-  void Replace(CFX_DIBitmap* pBitmap);
+  CFX_DIBitmap* GetBitmap() { return m_pBitmap.get(); }
+  std::unique_ptr<CFX_DIBitmap> Detach();
+  void Replace(std::unique_ptr<CFX_DIBitmap> pBitmap);
 
  private:
-  CFX_DIBitmap* m_pBitmap;
+  std::unique_ptr<CFX_DIBitmap> m_pBitmap;
 };
 
 class CFX_ImageStretcher {
  public:
   CFX_ImageStretcher(IFX_ScanlineComposer* pDest,
                      const CFX_DIBSource* pSource,
                      int dest_width,
                      int dest_height,
                      const FX_RECT& bitmap_rect,
                      uint32_t flags);
@@ skipping 21 matching lines @@
   int m_DestWidth;
   int m_DestHeight;
   FX_RECT m_ClipRect;
   const FXDIB_Format m_DestFormat;
   const int m_DestBPP;
   int m_LineIndex;
 };
 
 class CFX_ImageTransformer {
  public:
-  CFX_ImageTransformer();
+  CFX_ImageTransformer(const CFX_DIBSource* pSrc,
+                       const CFX_Matrix* pMatrix,
+                       int flags,
+                       const FX_RECT* pClip);
   ~CFX_ImageTransformer();
 
-  FX_BOOL Start(const CFX_DIBSource* pSrc,
-                const CFX_Matrix* pMatrix,
-                int flags,
-                const FX_RECT* pClip);
-
+  FX_BOOL Start();
   FX_BOOL Continue(IFX_Pause* pPause);
 
-  CFX_Matrix* m_pMatrix;
+  const FX_RECT& result() const { return m_result; }
+  std::unique_ptr<CFX_DIBitmap> DetachBitmap();
+
+ private:
+  const CFX_DIBSource* const m_pSrc;
+  const CFX_Matrix* const m_pMatrix;
+  const FX_RECT* const m_pClip;
   FX_RECT m_StretchClip;
-  int m_ResultLeft;
-  int m_ResultTop;
-  int m_ResultWidth;
-  int m_ResultHeight;
+  FX_RECT m_result;
   CFX_Matrix m_dest2stretch;
   std::unique_ptr<CFX_ImageStretcher> m_Stretcher;
   CFX_BitmapStorer m_Storer;
-  uint32_t m_Flags;
+  const uint32_t m_Flags;
   int m_Status;
 };
 
 class CFX_ImageRenderer {
  public:
   CFX_ImageRenderer();
   ~CFX_ImageRenderer();
 
   FX_BOOL Start(CFX_DIBitmap* pDevice,
                 const CFX_ClipRgn* pClipRgn,
@@ skipping 21 matching lines @@
   int m_Status;
   FX_RECT m_ClipBox;
   uint32_t m_Flags;
   int m_AlphaFlag;
   void* m_pIccTransform;
   FX_BOOL m_bRgbByteOrder;
   int m_BlendType;
 };
 
 #endif  // CORE_FXGE_INCLUDE_FX_DIB_H_