Use unique_ptr and initializer lists in various render files.

core/src/fpdfapi/fpdf_render/render_int.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_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
 #define CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
 
 #include <map>
@@ skipping 36 matching lines @@
 
  protected:
   CFX_GlyphBitmap* RenderGlyph(CPDF_Type3Glyphs* pSize,
                                FX_DWORD charcode,
                                const CFX_AffineMatrix* pMatrix,
                                FX_FLOAT retinaScaleX = 1.0f,
                                FX_FLOAT retinaScaleY = 1.0f);
   CPDF_Type3Font* const m_pFont;
   std::map<CFX_ByteString, CPDF_Type3Glyphs*> m_SizeMap;
 };
+
 class CPDF_TransferFunc {
  public:
-  CPDF_Document* m_pPDFDoc;
-  uint8_t m_Samples[256 * 3];
-  FX_BOOL m_bIdentity;
+  explicit CPDF_TransferFunc(CPDF_Document* pDoc);
 
+  FX_COLORREF TranslateColor(FX_COLORREF src) const;
   CFX_DIBSource* TranslateImage(const CFX_DIBSource* pSrc,
                                 FX_BOOL bAutoDropSrc);
-  FX_COLORREF TranslateColor(FX_COLORREF src);
+
+  CPDF_Document* const m_pPDFDoc;
+  FX_BOOL m_bIdentity;
+  uint8_t m_Samples[256 * 3];
 };
 
 class CPDF_DocRenderData {
  public:
   CPDF_DocRenderData(CPDF_Document* pPDFDoc = NULL);
   ~CPDF_DocRenderData();
   CPDF_Type3Cache* GetCachedType3(CPDF_Type3Font* pFont);
   CPDF_TransferFunc* GetTransferFunc(CPDF_Object* pObj);
   CFX_FontCache* GetFontCache() { return m_pFontCache; }
   void Clear(FX_BOOL bRelease = FALSE);
@@ skipping 170 matching lines @@
   static const int kRenderMaxRecursionDepth = 64;
   static int s_CurrentRecursionDepth;
 
   CFX_RenderDevice* m_pDevice;
   CFX_AffineMatrix m_DeviceMatrix;
   CPDF_ClipPath m_LastClipPath;
   const CPDF_PageObject* m_pCurObj;
   const CPDF_PageObject* m_pStopObj;
   CPDF_GraphicStates m_InitialStates;
   int m_HalftoneLimit;
-  IPDF_ObjectRenderer* m_pObjectRenderer;
+  nonstd::unique_ptr<IPDF_ObjectRenderer> m_pObjectRenderer;
   FX_BOOL m_bPrint;
   int m_Transparency;
   int m_DitherBits;
   FX_BOOL m_bDropObjects;
   FX_BOOL m_bStdCS;
   FX_DWORD m_GroupFamily;
   FX_BOOL m_bLoadMask;
   CPDF_Type3Char* m_pType3Char;
   FX_ARGB m_T3FillColor;
   int m_curBlend;
@@ skipping 108 matching lines @@
   FX_BOOL StartRenderDIBSource();
   FX_BOOL StartLoadDIBSource();
   FX_BOOL DrawMaskedImage();
   FX_BOOL DrawPatternImage(const CFX_Matrix* pObj2Device);
 };
 
 class CPDF_ScaledRenderBuffer {
  public:
   CPDF_ScaledRenderBuffer();
   ~CPDF_ScaledRenderBuffer();
+
   FX_BOOL Initialize(CPDF_RenderContext* pContext,
                      CFX_RenderDevice* pDevice,
                      FX_RECT* pRect,
                      const CPDF_PageObject* pObj,
                      const CPDF_RenderOptions* pOptions = NULL,
                      int max_dpi = 0);
   CFX_RenderDevice* GetDevice() {
-    return m_pBitmapDevice ? m_pBitmapDevice : m_pDevice;
+    return m_pBitmapDevice ? m_pBitmapDevice.get() : m_pDevice;
   }
   CFX_AffineMatrix* GetMatrix() { return &m_Matrix; }
   void OutputToDevice();
 
  private:
   CFX_RenderDevice* m_pDevice;
   CPDF_RenderContext* m_pContext;
   FX_RECT m_Rect;
   const CPDF_PageObject* m_pObject;
-  CFX_FxgeDevice* m_pBitmapDevice;
+  nonstd::unique_ptr<CFX_FxgeDevice> m_pBitmapDevice;
   CFX_AffineMatrix m_Matrix;
 };
+
 class ICodec_ScanlineDecoder;
 class CPDF_QuickStretcher {
  public:
   CPDF_QuickStretcher();
   ~CPDF_QuickStretcher();
   FX_BOOL Start(CPDF_ImageObject* pImageObj,
                 CFX_AffineMatrix* pImage2Device,
                 const FX_RECT* pClipBox);
   FX_BOOL Continue(IFX_Pause* pPause);
   CFX_DIBitmap* m_pBitmap;
   int m_ResultLeft, m_ResultTop, m_ClipLeft, m_ClipTop;
   int m_DestWidth, m_DestHeight, m_ResultWidth, m_ResultHeight;
   int m_Bpp, m_SrcWidth, m_SrcHeight;
   FX_BOOL m_bFlipX, m_bFlipY;
   CPDF_ColorSpace* m_pCS;
   ICodec_ScanlineDecoder* m_pDecoder;
   CPDF_StreamAcc m_StreamAcc;
   int m_LineIndex;
 };
+
 class CPDF_DeviceBuffer {
  public:
   CPDF_DeviceBuffer();
   ~CPDF_DeviceBuffer();
   FX_BOOL Initialize(CPDF_RenderContext* pContext,
                      CFX_RenderDevice* pDevice,
                      FX_RECT* pRect,
                      const CPDF_PageObject* pObj,
                      int max_dpi = 0);
   void OutputToDevice();
-  CFX_DIBitmap* GetBitmap() const { return m_pBitmap; }
+  CFX_DIBitmap* GetBitmap() const { return m_pBitmap.get(); }
   const CFX_AffineMatrix* GetMatrix() const { return &m_Matrix; }
 
  private:
   CFX_RenderDevice* m_pDevice;
   CPDF_RenderContext* m_pContext;
   FX_RECT m_Rect;
   const CPDF_PageObject* m_pObject;
-  CFX_DIBitmap* m_pBitmap;
+  nonstd::unique_ptr<CFX_DIBitmap> m_pBitmap;
   CFX_AffineMatrix m_Matrix;
 };
+
 class CPDF_ImageCache {
  public:
   CPDF_ImageCache(CPDF_Document* pDoc, CPDF_Stream* pStream);
   ~CPDF_ImageCache();
   void ClearImageData();
   void Reset(const CFX_DIBitmap* pBitmap);
   FX_BOOL GetCachedBitmap(CFX_DIBSource*& pBitmap,
                           CFX_DIBSource*& pMask,
                           FX_DWORD& MatteColor,
                           CPDF_Dictionary* pPageResources,
@@ skipping 182 matching lines @@
   const uint8_t* m_RampB;
 };
 
 struct _CPDF_UniqueKeyGen {
   void Generate(int count, ...);
   FX_CHAR m_Key[128];
   int m_KeyLen;
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_