Clean up CPDF_Page.

fpdfsdk/fpdfview.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 "public/fpdfview.h"
 
 #include <memory>
 
@@ skipping 484 matching lines @@
     return nullptr;
 
   if (page_index < 0 || page_index >= pDoc->GetPageCount())
     return nullptr;
 
 #ifdef PDF_ENABLE_XFA
   return pDoc->GetPage(page_index);
 #else   // PDF_ENABLE_XFA
   CPDF_Dictionary* pDict = pDoc->GetPage(page_index);
   if (!pDict)
-    return NULL;
-  CPDF_Page* pPage = new CPDF_Page;
-  pPage->Load(pDoc, pDict);
-  pPage->ParseContent(nullptr);
+    return nullptr;
+
+  CPDF_Page* pPage = new CPDF_Page(pDoc, pDict, true);
+  pPage->ParseContent();
   return pPage;
 #endif  // PDF_ENABLE_XFA
 }
 
 DLLEXPORT double STDCALL FPDF_GetPageWidth(FPDF_PAGE page) {
   UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page);
   return pPage ? pPage->GetPageWidth() : 0.0;
 }
 
 DLLEXPORT double STDCALL FPDF_GetPageHeight(FPDF_PAGE page) {
@@ skipping 431 matching lines @@
   if (page_index < 0 || page_index >= count)
     return FALSE;
   CPDFXFA_Page* pPage = pDoc->GetPage(page_index);
   if (!pPage)
     return FALSE;
   *width = pPage->GetPageWidth();
   *height = pPage->GetPageHeight();
 #else   // PDF_ENABLE_XFA
   CPDF_Dictionary* pDict = pDoc->GetPage(page_index);
   if (!pDict)
-    return FALSE;
-  CPDF_Page page;
-  page.Load(pDoc, pDict);
+    return false;

[dsinclair, 2016/04/26 02:42:26]

Should this be FALSE for consistency?

nit: blank line after braceless if.

[Lei Zhang, 2016/04/26 04:24:45]

Whoops, reverted.

+  CPDF_Page page(pDoc, pDict, true);

[Lei Zhang, 2016/04/26 01:22:21]

This is the only instance that does not call ParseContent(), BTW.

   *width = page.GetPageWidth();
   *height = page.GetPageHeight();
 #endif  // PDF_ENABLE_XFA
 
   return TRUE;
 }
 
 DLLEXPORT FPDF_BOOL STDCALL
 FPDF_VIEWERREF_GetPrintScaling(FPDF_DOCUMENT document) {
   CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document);
@@ skipping 188 matching lines @@
   if (!buffer) {
     *buflen = len;
   } else if (*buflen >= len) {
     memcpy(buffer, utf16Name.c_str(), len);
     *buflen = len;
   } else {
     *buflen = -1;
   }
   return (FPDF_DEST)pDestObj;
 }