Cleanup CPDFXFA_Page.

fpdfsdk/fpdfxfa/fpdfxfa_page.cpp

 // 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
 
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h"
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h"
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "xfa/fxfa/include/xfa_ffdocview.h"
 #include "xfa/fxfa/include/xfa_ffpageview.h"
 
 CPDFXFA_Page::CPDFXFA_Page(CPDFXFA_Document* pDoc, int page_index)
-    : m_pPDFPage(NULL),
-      m_pXFAPageView(NULL),
+    : m_pXFAPageView(nullptr),
+      m_pDocument(pDoc),
       m_iPageIndex(page_index),
-      m_pDocument(pDoc),
       m_iRef(1) {}
 
-CPDFXFA_Page::~CPDFXFA_Page() {
-  if (m_pPDFPage)
-    delete m_pPDFPage;
-  m_pPDFPage = NULL;
-  m_pXFAPageView = NULL;
-}
+CPDFXFA_Page::~CPDFXFA_Page() {}
 
 void CPDFXFA_Page::Release() {
-  m_iRef--;
-  if (m_iRef > 0)
+  if (--m_iRef > 0)
     return;
 
   if (m_pDocument)
     m_pDocument->RemovePage(this);
 
   delete this;
 }
 
 FX_BOOL CPDFXFA_Page::LoadPDFPage() {
   if (!m_pDocument)
     return FALSE;
+
   CPDF_Document* pPDFDoc = m_pDocument->GetPDFDoc();
-  if (pPDFDoc) {
-    CPDF_Dictionary* pDict = pPDFDoc->GetPage(m_iPageIndex);
-    if (pDict == NULL)
-      return FALSE;
-    if (m_pPDFPage) {
-      if (m_pPDFPage->m_pFormDict == pDict)
-        return TRUE;
+  if (!pPDFDoc)
+    return FALSE;
 
-      delete m_pPDFPage;
-      m_pPDFPage = NULL;
-    }
+  CPDF_Dictionary* pDict = pPDFDoc->GetPage(m_iPageIndex);
+  if (!pDict)
+    return FALSE;
 
-    m_pPDFPage = new CPDF_Page;
+  if (!m_pPDFPage || m_pPDFPage->m_pFormDict != pDict) {
+    m_pPDFPage.reset(new CPDF_Page);
     m_pPDFPage->Load(pPDFDoc, pDict);
     m_pPDFPage->ParseContent(nullptr);
-    return TRUE;
   }
-
-  return FALSE;
+  return TRUE;
 }
 
 FX_BOOL CPDFXFA_Page::LoadXFAPageView() {
   if (!m_pDocument)
     return FALSE;
+
   CXFA_FFDoc* pXFADoc = m_pDocument->GetXFADoc();
   if (!pXFADoc)
     return FALSE;
 
   CXFA_FFDocView* pXFADocView = m_pDocument->GetXFADocView();
   if (!pXFADocView)
     return FALSE;
 
   CXFA_FFPageView* pPageView = pXFADocView->GetPageView(m_iPageIndex);
   if (!pPageView)
     return FALSE;
 
   if (m_pXFAPageView == pPageView)
     return TRUE;
 
   m_pXFAPageView = pPageView;
-  (void)m_pXFAPageView->LoadPageView(nullptr);
+  m_pXFAPageView->LoadPageView(nullptr);

[Tom Sepez, 2016/04/12 23:40:00]

nit: I think this (void) was shorthand for // FIXME: check return value.

[Lei Zhang, 2016/04/13 00:56:52]

Not worth checking. See next patch set.

   return TRUE;
 }
 
 FX_BOOL CPDFXFA_Page::LoadPage() {
   if (!m_pDocument || m_iPageIndex < 0)
     return FALSE;
 
   int iDocType = m_pDocument->GetDocType();
   switch (iDocType) {
     case DOCTYPE_PDF:
     case DOCTYPE_STATIC_XFA: {
       return LoadPDFPage();
     }
     case DOCTYPE_DYNAMIC_XFA: {
       return LoadXFAPageView();
     }
     default:
       return FALSE;
   }
 }
 
 FX_BOOL CPDFXFA_Page::LoadPDFPage(CPDF_Dictionary* pageDict) {
   if (!m_pDocument || m_iPageIndex < 0 || !pageDict)
     return FALSE;
 
-  if (m_pPDFPage)
-    delete m_pPDFPage;
-
-  m_pPDFPage = new CPDF_Page();
+  m_pPDFPage.reset(new CPDF_Page());
   m_pPDFPage->Load(m_pDocument->GetPDFDoc(), pageDict);
   m_pPDFPage->ParseContent(nullptr);
-
   return TRUE;
 }
 
-FX_FLOAT CPDFXFA_Page::GetPageWidth() {
+FX_FLOAT CPDFXFA_Page::GetPageWidth() const {
   if (!m_pPDFPage && !m_pXFAPageView)
     return 0.0f;
 
   int nDocType = m_pDocument->GetDocType();
   switch (nDocType) {
     case DOCTYPE_DYNAMIC_XFA: {
       if (m_pXFAPageView) {
         CFX_RectF rect;
         m_pXFAPageView->GetPageViewRect(rect);
         return rect.width;
       }
     } break;
     case DOCTYPE_STATIC_XFA:
     case DOCTYPE_PDF: {
       if (m_pPDFPage)
         return m_pPDFPage->GetPageWidth();
     } break;
     default:
       return 0.0f;
   }
 
   return 0.0f;
 }
 
-FX_FLOAT CPDFXFA_Page::GetPageHeight() {
+FX_FLOAT CPDFXFA_Page::GetPageHeight() const {
   if (!m_pPDFPage && !m_pXFAPageView)
     return 0.0f;
 
   int nDocType = m_pDocument->GetDocType();
   switch (nDocType) {
     case DOCTYPE_PDF:
     case DOCTYPE_STATIC_XFA: {
       if (m_pPDFPage)
         return m_pPDFPage->GetPageHeight();
     } break;
@@ skipping 82 matching lines @@
     case DOCTYPE_PDF:
     case DOCTYPE_STATIC_XFA: {
       if (m_pPDFPage) {
         m_pPDFPage->GetDisplayMatrix(matrix, xPos, yPos, xSize, ySize, iRotate);
       }
     } break;
     default:
       return;
   }
 }