Use smart pointers for class owned member variables

Replace raw member variables to smart pointer type to better
maintain the ownership and to ease the management.

BUG=pdfium:518

Review-Url: https://codereview.chromium.org/2136683002

3 files changed, 31 insertions, 29 deletions

diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
index b9826a9338..0ea4a17684 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -326,29 +326,26 @@ void CPDF_DIBTransferFunc::TranslateDownSamples(uint8_t* dest_buf,
 #endif
   }
 }
+
 CPDF_ImageRenderer::CPDF_ImageRenderer() {
   m_pRenderStatus = nullptr;
   m_pImageObject = nullptr;
   m_Result = TRUE;
   m_Status = 0;
-  m_pTransformer = nullptr;
   m_DeviceHandle = nullptr;
-  m_LoadHandle = nullptr;
-  m_pClone = nullptr;
   m_bStdCS = FALSE;
   m_bPatternColor = FALSE;
   m_BlendType = FXDIB_BLEND_NORMAL;
   m_pPattern = nullptr;
   m_pObj2Device = nullptr;
 }
+
 CPDF_ImageRenderer::~CPDF_ImageRenderer() {
-  delete m_pTransformer;
   if (m_DeviceHandle) {
     m_pRenderStatus->m_pDevice->CancelDIBits(m_DeviceHandle);
   }
-  delete m_LoadHandle;
-  delete m_pClone;
 }
+
 FX_BOOL CPDF_ImageRenderer::StartLoadDIBSource() {
   CFX_FloatRect image_rect_f = m_ImageMatrix.GetUnitRect();
   FX_RECT image_rect = image_rect_f.GetOutterRect();
@@ -361,7 +358,7 @@ FX_BOOL CPDF_ImageRenderer::StartLoadDIBSource() {
     dest_height = -dest_height;
   }
   if (m_Loader.Start(m_pImageObject,
-                     m_pRenderStatus->m_pContext->GetPageCache(), m_LoadHandle,
+                     m_pRenderStatus->m_pContext->GetPageCache(), &m_LoadHandle,
                      m_bStdCS, m_pRenderStatus->m_GroupFamily,
                      m_pRenderStatus->m_bLoadMask, m_pRenderStatus, dest_width,
                      dest_height)) {
@@ -372,6 +369,7 @@ FX_BOOL CPDF_ImageRenderer::StartLoadDIBSource() {
   }
   return FALSE;
 }
+
 FX_BOOL CPDF_ImageRenderer::StartRenderDIBSource() {
   if (!m_Loader.m_pBitmap) {
     return FALSE;
@@ -416,10 +414,10 @@ FX_BOOL CPDF_ImageRenderer::StartRenderDIBSource() {
     }
     m_FillArgb = m_pRenderStatus->GetFillArgb(m_pImageObject);
   } else if (m_pRenderStatus->m_Options.m_ColorMode == RENDER_COLOR_GRAY) {
-    m_pClone = m_pDIBSource->Clone();
+    m_pClone.reset(m_pDIBSource->Clone());
     m_pClone->ConvertColorScale(m_pRenderStatus->m_Options.m_BackColor,
                                 m_pRenderStatus->m_Options.m_ForeColor);
-    m_pDIBSource = m_pClone;
+    m_pDIBSource = m_pClone.get();
   }
   m_Flags = 0;
   if (m_pRenderStatus->m_Options.m_Flags & RENDER_FORCE_DOWNSAMPLE) {
@@ -488,6 +486,7 @@ FX_BOOL CPDF_ImageRenderer::StartRenderDIBSource() {
   }
   return StartDIBSource();
 }
+
 FX_BOOL CPDF_ImageRenderer::Start(CPDF_RenderStatus* pStatus,
                                   const CPDF_PageObject* pObj,
                                   const CFX_Matrix* pObj2Device,
@@ -510,6 +509,7 @@ FX_BOOL CPDF_ImageRenderer::Start(CPDF_RenderStatus* pStatus,
   }
   return StartRenderDIBSource();
 }
+
 FX_BOOL CPDF_ImageRenderer::Start(CPDF_RenderStatus* pStatus,
                                   const CFX_DIBSource* pDIBSource,
                                   FX_ARGB bitmap_argb,
@@ -528,6 +528,7 @@ FX_BOOL CPDF_ImageRenderer::Start(CPDF_RenderStatus* pStatus,
   m_BlendType = blendType;
   return StartDIBSource();
 }
+
 FX_BOOL CPDF_ImageRenderer::DrawPatternImage(const CFX_Matrix* pObj2Device) {
   if (m_pRenderStatus->m_bPrint &&
       !(m_pRenderStatus->m_pDevice->GetRenderCaps() & FXRC_BLEND_MODE)) {
@@ -773,8 +774,8 @@ FX_BOOL CPDF_ImageRenderer::StartDIBSource() {
     FX_RECT clip_box = m_pRenderStatus->m_pDevice->GetClipBox();
     clip_box.Intersect(image_rect);
     m_Status = 2;
-    m_pTransformer = new CFX_ImageTransformer(m_pDIBSource, &m_ImageMatrix,
-                                              m_Flags, &clip_box);
+    m_pTransformer.reset(new CFX_ImageTransformer(m_pDIBSource, &m_ImageMatrix,
+                                                  m_Flags, &clip_box));
     m_pTransformer->Start();
     return TRUE;
   }
@@ -896,7 +897,7 @@ FX_BOOL CPDF_ImageRenderer::Continue(IFX_Pause* pPause) {
     return m_pRenderStatus->m_pDevice->ContinueDIBits(m_DeviceHandle, pPause);
 
   if (m_Status == 4) {
-    if (m_Loader.Continue(m_LoadHandle, pPause))
+    if (m_Loader.Continue(m_LoadHandle.get(), pPause))
       return TRUE;
 
     if (StartRenderDIBSource())
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
index 2b829d0c56..91574345d3 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
@@ -1548,21 +1548,22 @@ FX_BOOL CPDF_ImageLoaderHandle::Continue(IFX_Pause* pPause) {
   return ret;
 }
 
-FX_BOOL CPDF_ImageLoader::Start(const CPDF_ImageObject* pImage,
-                                CPDF_PageRenderCache* pCache,
-                                CPDF_ImageLoaderHandle*& LoadHandle,
-                                FX_BOOL bStdCS,
-                                uint32_t GroupFamily,
-                                FX_BOOL bLoadMask,
-                                CPDF_RenderStatus* pRenderStatus,
-                                int32_t nDownsampleWidth,
-                                int32_t nDownsampleHeight) {
+FX_BOOL CPDF_ImageLoader::Start(
+    const CPDF_ImageObject* pImage,
+    CPDF_PageRenderCache* pCache,
+    std::unique_ptr<CPDF_ImageLoaderHandle>* pLoadHandle,
+    FX_BOOL bStdCS,
+    uint32_t GroupFamily,
+    FX_BOOL bLoadMask,
+    CPDF_RenderStatus* pRenderStatus,
+    int32_t nDownsampleWidth,
+    int32_t nDownsampleHeight) {
   m_nDownsampleWidth = nDownsampleWidth;
   m_nDownsampleHeight = nDownsampleHeight;
-  LoadHandle = new CPDF_ImageLoaderHandle;
-  return LoadHandle->Start(this, pImage, pCache, bStdCS, GroupFamily, bLoadMask,
-                           pRenderStatus, m_nDownsampleWidth,
-                           m_nDownsampleHeight);
+  pLoadHandle->reset(new CPDF_ImageLoaderHandle);
+  return (*pLoadHandle)
+      ->Start(this, pImage, pCache, bStdCS, GroupFamily, bLoadMask,
+              pRenderStatus, m_nDownsampleWidth, m_nDownsampleHeight);
 }
 
 FX_BOOL CPDF_ImageLoader::Continue(CPDF_ImageLoaderHandle* LoadHandle,
diff --git a/core/fpdfapi/fpdf_render/render_int.h b/core/fpdfapi/fpdf_render/render_int.h
index d86a62ab19..99d1dfc292 100644
--- a/core/fpdfapi/fpdf_render/render_int.h
+++ b/core/fpdfapi/fpdf_render/render_int.h
@@ -293,7 +293,7 @@ class CPDF_ImageLoader {
 
   FX_BOOL Start(const CPDF_ImageObject* pImage,
                 CPDF_PageRenderCache* pCache,
-                CPDF_ImageLoaderHandle*& LoadHandle,
+                std::unique_ptr<CPDF_ImageLoaderHandle>* pLoadHandle,
                 FX_BOOL bStdCS = FALSE,
                 uint32_t GroupFamily = 0,
                 FX_BOOL bLoadMask = FALSE,
@@ -373,15 +373,15 @@ class CPDF_ImageRenderer {
   CFX_Matrix m_ImageMatrix;
   CPDF_ImageLoader m_Loader;
   const CFX_DIBSource* m_pDIBSource;
-  CFX_DIBitmap* m_pClone;
+  std::unique_ptr<CFX_DIBitmap> m_pClone;
   int m_BitmapAlpha;
   FX_BOOL m_bPatternColor;
   CPDF_Pattern* m_pPattern;
   FX_ARGB m_FillArgb;
   uint32_t m_Flags;
-  CFX_ImageTransformer* m_pTransformer;
+  std::unique_ptr<CFX_ImageTransformer> m_pTransformer;
   void* m_DeviceHandle;
-  CPDF_ImageLoaderHandle* m_LoadHandle;
+  std::unique_ptr<CPDF_ImageLoaderHandle> m_LoadHandle;
   FX_BOOL m_bStdCS;
   int m_BlendType;
 };