Clean up CPDF_Page.

fpdfsdk/javascript/Document.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/javascript/Document.h"
 
 #include <vector>
 
@@ skipping 1330 matching lines @@
   CJS_Context* pContext = static_cast<CJS_Context*>(cc);
   if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount()) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
     return FALSE;
   }
 
   CPDF_Dictionary* pPageDict = pDocument->GetPage(nPageNo);
   if (!pPageDict)
     return FALSE;
 
-  CPDF_Page page;
-  page.Load(pDocument, pPageDict);
-  page.ParseContent(nullptr);
+  CPDF_Page page(pDocument, pPageDict, true);
+  page.ParseContent();
 
   int nWords = 0;
   CFX_WideString swRet;
   for (auto& pPageObj : *page.GetPageObjectList()) {
     if (pPageObj->IsText()) {
       CPDF_TextObject* pTextObj = pPageObj->AsText();
       int nObjWords = CountWords(pTextObj);
       if (nWords + nObjWords >= nWordNo) {
         swRet = GetObjWordStr(pTextObj, nWordNo - nWords);
         break;
@@ skipping 33 matching lines @@
   CJS_Context* pContext = static_cast<CJS_Context*>(cc);
   if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount()) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
     return FALSE;
   }
 
   CPDF_Dictionary* pPageDict = pDocument->GetPage(nPageNo);
   if (!pPageDict)
     return FALSE;
 
-  CPDF_Page page;
-  page.Load(pDocument, pPageDict);
-  page.ParseContent(nullptr);
+  CPDF_Page page(pDocument, pPageDict, true);
+  page.ParseContent();
 
   int nWords = 0;
   for (auto& pPageObj : *page.GetPageObjectList()) {
     if (pPageObj->IsText())
       nWords += CountWords(pPageObj->AsText());
   }
 
   vRet = nWords;
   return TRUE;
 }
@@ skipping 164 matching lines @@
     }
   }
 
   for (const auto& pData : DelayDataForFieldAndControlIndex)
     Field::DoDelay(m_pDocument, pData.get());
 }
 
 CJS_Document* Document::GetCJSDoc() const {
   return static_cast<CJS_Document*>(m_pJSObject);
 }