Split CPDF_PageObjectHolder off from CPDF_PageObjectList

fpdfsdk/src/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 "Document.h"
 
 #include "Field.h"
 #include "Icon.h"
@@ skipping 1362 matching lines @@
   }
 
   CPDF_Dictionary* pPageDict = pDocument->GetPage(nPageNo);
   if (!pPageDict)
     return FALSE;
 
   CPDF_Page page;
   page.Load(pDocument, pPageDict);
   page.ParseContent(nullptr);
 
-  FX_POSITION pos = page.GetFirstObjectPosition();
-
   int nWords = 0;
-
   CFX_WideString swRet;
-
+  FX_POSITION pos = page.GetPageObjectList()->GetHeadPosition();
   while (pos) {
-    if (CPDF_PageObject* pPageObj = page.GetNextObject(pos)) {
+    if (CPDF_PageObject* pPageObj =
+            page.GetPageObjectList()->GetNextObject(pos)) {
       if (pPageObj->m_Type == CPDF_PageObject::TEXT) {
         int nObjWords = CountWords((CPDF_TextObject*)pPageObj);
 
         if (nWords + nObjWords >= nWordNo) {
           swRet = GetObjWordStr((CPDF_TextObject*)pPageObj, nWordNo - nWords);
           break;
         }
 
         nWords += nObjWords;
       }
@@ skipping 36 matching lines @@
 
   CPDF_Dictionary* pPageDict = pDocument->GetPage(nPageNo);
   if (!pPageDict)
     return FALSE;
 
   CPDF_Page page;
   page.Load(pDocument, pPageDict);
   page.ParseContent(nullptr);
 
   int nWords = 0;
-  FX_POSITION pos = page.GetFirstObjectPosition();
+  FX_POSITION pos = page.GetPageObjectList()->GetHeadPosition();
   while (pos) {
-    if (CPDF_PageObject* pPageObj = page.GetNextObject(pos)) {
+    if (CPDF_PageObject* pPageObj =
+            page.GetPageObjectList()->GetNextObject(pos)) {
       if (pPageObj->m_Type == CPDF_PageObject::TEXT) {
         CPDF_TextObject* pTextObj = (CPDF_TextObject*)pPageObj;
         nWords += CountWords(pTextObj);
       }
     }
   }
 
   vRet = nWords;
   return TRUE;
 }
@@ skipping 176 matching lines @@
     CJS_DelayData* pData = DelayDataForFieldAndControlIndex.GetAt(i);
     Field::DoDelay(m_pDocument, pData);
     DelayDataForFieldAndControlIndex.SetAt(i, NULL);
     delete pData;
   }
 }
 
 CJS_Document* Document::GetCJSDoc() const {
   return static_cast<CJS_Document*>(m_pJSObject);
 }