Split CPDF_PageObjectHolder off from CPDF_PageObjectList

core/src/fpdftext/text_int.h

 // 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
 
 #ifndef CORE_SRC_FPDFTEXT_TEXT_INT_H_
 #define CORE_SRC_FPDFTEXT_TEXT_INT_H_
 
 #include <deque>
@@ skipping 114 matching lines @@
   void AddCharInfoByRLDirection(FX_WCHAR wChar, PAGECHAR_INFO info);
   int32_t GetTextObjectWritingMode(const CPDF_TextObject* pTextObj);
   int32_t FindTextlineFlowDirection();
 
   void SwapTempTextBuf(int32_t iCharListStartAppend, int32_t iBufStartAppend);
   FX_BOOL IsRightToLeft(const CPDF_TextObject* pTextObj,
                         const CPDF_Font* pFont,
                         int nItems) const;
 
   std::vector<FX_WORD> m_CharIndex;
-  const CPDF_PageObjectList* const m_pPage;
+  const CPDF_PageObjectHolder* const m_pPageObjectHolder;

[Lei Zhang, 2016/02/17 00:28:59]

Can this be const CPDF_Page* const to avoid some of the casting in
fpdf_text_int.cpp?

[Tom Sepez, 2016/02/17 00:59:45]

Good idea.  The ctor is only called with a page, not a form, so we don't need
the common superclass.

   std::deque<PAGECHAR_INFO> m_CharList;
   std::deque<PAGECHAR_INFO> m_TempCharList;
   CFX_WideTextBuf m_TextBuf;
   CFX_WideTextBuf m_TempTextBuf;
   const int m_parserflag;
   CPDF_TextObject* m_pPreTextObj;
   CFX_Matrix m_perMatrix;
   bool m_bIsParsed;
   CFX_Matrix m_DisplayMatrix;
   CFX_ArrayTemplate<FPDF_SEGMENT> m_Segments;
@@ skipping 86 matching lines @@
  private:
   LINK_InfoArray m_LinkList;
   const CPDF_TextPage* m_pTextPage;
   CFX_WideString m_strPageText;
   bool m_bIsParsed;
 };
 
 FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst);
 
 #endif  // CORE_SRC_FPDFTEXT_TEXT_INT_H_