Split CPDF_PageObjectHolder off from CPDF_PageObjectList

Eventually, we're going to expose an iterator over
CPDF_PageObjectList that we don't want to be inherited by
the CPDF_PageObjectHolder sub-classes: page and form.

Also, the operations that the object holder performs dealing
with inquiring about masks and such seem beyond the scope of
what a list would provide.  Hence the "Holder" name.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1701073002 .

1 files changed, 3 insertions, 3 deletions

diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
index d0427f68fa..7e2c0bd0fd 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
@@ -316,9 +316,9 @@ FX_BOOL CPDF_Type3Char::LoadBitmap(CPDF_RenderContext* pContext) {
   if (m_pBitmap || !m_pForm) {
     return TRUE;
   }
-  if (m_pForm->CountObjects() == 1 && !m_bColored) {
-    CPDF_PageObject* pPageObj =
-        m_pForm->GetObjectAt(m_pForm->GetFirstObjectPosition());
+  if (m_pForm->GetPageObjectList()->GetCount() == 1 && !m_bColored) {
+    CPDF_PageObject* pPageObj = m_pForm->GetPageObjectList()->GetObjectAt(
+        m_pForm->GetPageObjectList()->GetHeadPosition());
     if (pPageObj->m_Type == CPDF_PageObject::IMAGE) {
       CPDF_ImageObject* pImage = (CPDF_ImageObject*)pPageObj;
       m_ImageMatrix = pImage->m_Matrix;