Split CPDF_PageObjectHolder off from CPDF_PageObjectList

core/src/fpdfapi/fpdf_page/fpdf_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 "pageint.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
@@ skipping 652 matching lines @@
   m_FormMatrix = pSrcObj->m_FormMatrix;
 }
 void CPDF_FormObject::CalcBoundingBox() {
   CFX_FloatRect form_rect = m_pForm->CalcBoundingBox();
   form_rect.Transform(&m_FormMatrix);
   m_Left = form_rect.left;
   m_Bottom = form_rect.bottom;
   m_Right = form_rect.right;
   m_Top = form_rect.top;
 }
-CPDF_PageObjectList::CPDF_PageObjectList()
+CPDF_PageObjectHolder::CPDF_PageObjectHolder()
     : m_pFormDict(nullptr),
       m_pFormStream(nullptr),
       m_pDocument(nullptr),
       m_pPageResources(nullptr),
       m_pResources(nullptr),
       m_Transparency(0),
       m_bBackgroundAlphaNeeded(FALSE),
       m_bHasImageMask(FALSE),
       m_ParseState(CONTENT_NOT_PARSED),
-      m_ObjectList(128) {}
-CPDF_PageObjectList::~CPDF_PageObjectList() {
-  FX_POSITION pos = m_ObjectList.GetHeadPosition();
+      m_PageObjectList(128) {}
+
+CPDF_PageObjectHolder::~CPDF_PageObjectHolder() {
+  FX_POSITION pos = m_PageObjectList.GetHeadPosition();
   while (pos) {
-    delete (CPDF_PageObject*)m_ObjectList.GetNext(pos);
+    delete m_PageObjectList.GetNextObject(pos);
   }
 }
-void CPDF_PageObjectList::ContinueParse(IFX_Pause* pPause) {
+void CPDF_PageObjectHolder::ContinueParse(IFX_Pause* pPause) {
   if (!m_pParser) {
     return;
   }
   m_pParser->Continue(pPause);
   if (m_pParser->GetStatus() == CPDF_ContentParser::Done) {
     m_ParseState = CONTENT_PARSED;
     m_pParser.reset();
   }
 }
 FX_POSITION CPDF_PageObjectList::InsertObject(FX_POSITION posInsertAfter,
                                               CPDF_PageObject* pNewObject) {
   if (!posInsertAfter) {
-    return m_ObjectList.AddHead(pNewObject);
+    return AddHead(pNewObject);
   }
-  return m_ObjectList.InsertAfter(posInsertAfter, pNewObject);
-}
-int CPDF_PageObjectList::GetObjectIndex(CPDF_PageObject* pObj) const {
-  int index = 0;
-  FX_POSITION pos = m_ObjectList.GetHeadPosition();
-  while (pos) {
-    CPDF_PageObject* pThisObj = (CPDF_PageObject*)m_ObjectList.GetNext(pos);
-    if (pThisObj == pObj) {
-      return index;
-    }
-    index++;
-  }
-  return -1;
+  return InsertAfter(posInsertAfter, pNewObject);
 }
 CPDF_PageObject* CPDF_PageObjectList::GetObjectByIndex(int index) const {
-  FX_POSITION pos = m_ObjectList.FindIndex(index);
-  return pos ? static_cast<CPDF_PageObject*>(m_ObjectList.GetAt(pos)) : nullptr;
+  FX_POSITION pos = FindIndex(index);
+  return pos ? GetObjectAt(pos) : nullptr;
 }
-void CPDF_PageObjectList::Transform(const CFX_Matrix& matrix) {
-  FX_POSITION pos = m_ObjectList.GetHeadPosition();
+void CPDF_PageObjectHolder::Transform(const CFX_Matrix& matrix) {
+  FX_POSITION pos = m_PageObjectList.GetHeadPosition();
   while (pos) {
-    CPDF_PageObject* pObj = (CPDF_PageObject*)m_ObjectList.GetNext(pos);
-    pObj->Transform(matrix);
+    m_PageObjectList.GetNextObject(pos)->Transform(matrix);
   }
 }
-CFX_FloatRect CPDF_PageObjectList::CalcBoundingBox() const {
-  if (m_ObjectList.GetCount() == 0) {
+CFX_FloatRect CPDF_PageObjectHolder::CalcBoundingBox() const {
+  if (m_PageObjectList.GetCount() == 0) {
     return CFX_FloatRect(0, 0, 0, 0);
   }
   FX_FLOAT left, right, top, bottom;
   left = bottom = 1000000 * 1.0f;
   right = top = -1000000 * 1.0f;
-  FX_POSITION pos = m_ObjectList.GetHeadPosition();
+  FX_POSITION pos = m_PageObjectList.GetHeadPosition();
   while (pos) {
-    CPDF_PageObject* pObj = (CPDF_PageObject*)m_ObjectList.GetNext(pos);
+    CPDF_PageObject* pObj = (CPDF_PageObject*)m_PageObjectList.GetNext(pos);
     if (left > pObj->m_Left) {
       left = pObj->m_Left;
     }
     if (right < pObj->m_Right) {
       right = pObj->m_Right;
     }
     if (top < pObj->m_Top) {
       top = pObj->m_Top;
     }
     if (bottom > pObj->m_Bottom) {
       bottom = pObj->m_Bottom;
     }
   }
   return CFX_FloatRect(left, bottom, right, top);
 }
-void CPDF_PageObjectList::LoadTransInfo() {
+void CPDF_PageObjectHolder::LoadTransInfo() {
   if (!m_pFormDict) {
     return;
   }
   CPDF_Dictionary* pGroup = m_pFormDict->GetDictBy("Group");
   if (!pGroup) {
     return;
   }
   if (pGroup->GetStringBy("S") != "Transparency") {
     return;
   }
@@ skipping 153 matching lines @@
                              CFX_Matrix* pParentMatrix,
                              CPDF_Type3Char* pType3Char,
                              CPDF_ParseOptions* pOptions,
                              int level) {
   StartParse(pGraphicStates, pParentMatrix, pType3Char, pOptions, level);
   ContinueParse(NULL);
 }
 CPDF_Form* CPDF_Form::Clone() const {
   CPDF_Form* pClone =
       new CPDF_Form(m_pDocument, m_pPageResources, m_pFormStream, m_pResources);
-  FX_POSITION pos = m_ObjectList.GetHeadPosition();
+  FX_POSITION pos = m_PageObjectList.GetHeadPosition();
   while (pos) {
-    CPDF_PageObject* pObj = (CPDF_PageObject*)m_ObjectList.GetNext(pos);
-    pClone->m_ObjectList.AddTail(pObj->Clone());
+    CPDF_PageObject* pObj = (CPDF_PageObject*)m_PageObjectList.GetNext(pos);
+    pClone->m_PageObjectList.AddTail(pObj->Clone());
   }
   return pClone;
 }
 void CPDF_Page::GetDisplayMatrix(CFX_Matrix& matrix,
                                  int xPos,
                                  int yPos,
                                  int xSize,
                                  int ySize,
                                  int iRotate) const {
   if (m_PageWidth == 0 || m_PageHeight == 0) {
@@ skipping 43 matching lines @@
                      (FX_FLOAT)y0);
   matrix = m_PageMatrix;
   matrix.Concat(display_matrix);
 }
 CPDF_ParseOptions::CPDF_ParseOptions() {
   m_bTextOnly = FALSE;
   m_bMarkedContent = TRUE;
   m_bSeparateForm = TRUE;
   m_bDecodeInlineImage = FALSE;
 }