Merge to XFA: Rename CPDF_PageObjects to CPDF_PageObjectList

Orignal Review URL: https://codereview.chromium.org/1612113003 .
(cherry picked from commit 9ebc84109d7d2f7b81f06f19e5db20888e026c3b)

R=ochang@chromium.org
TBR=ochang@chromium.org

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

15 files changed, 45 insertions, 45 deletions

diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h
index e22b63e544..f68511cc77 100644
--- a/core/include/fpdfapi/fpdf_module.h
+++ b/core/include/fpdfapi/fpdf_module.h
@@ -24,7 +24,7 @@ class CPDF_Document;
 class CPDF_FontGlobals;
 class CPDF_Image;
 class CPDF_Page;
-class CPDF_PageObjects;
+class CPDF_PageObjectList;
 class CPDF_PageRenderCache;
 class CPDF_RenderConfig;
 class CPDF_RenderOptions;
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h
index 2ff8a0596b..20030e7dea 100644
--- a/core/include/fpdfapi/fpdf_page.h
+++ b/core/include/fpdfapi/fpdf_page.h
@@ -26,10 +26,10 @@ class CPDF_StreamContentParser;
 #define PDFTRANS_ISOLATED 0x0200
 #define PDFTRANS_KNOCKOUT 0x0400
 
-class CPDF_PageObjects {
+class CPDF_PageObjectList {
  public:
-  CPDF_PageObjects();
-  ~CPDF_PageObjects();
+  CPDF_PageObjectList();
+  ~CPDF_PageObjectList();
 
   void ContinueParse(IFX_Pause* pPause);
 
@@ -96,7 +96,7 @@ class CPDF_PageObjects {
   CFX_PtrList m_ObjectList;
 };
 
-class CPDF_Page : public CPDF_PageObjects, public CFX_PrivateData {
+class CPDF_Page : public CPDF_PageObjectList, public CFX_PrivateData {
  public:
   CPDF_Page();
   ~CPDF_Page();
@@ -142,7 +142,7 @@ class CPDF_ParseOptions {
 
   FX_BOOL m_bDecodeInlineImage;
 };
-class CPDF_Form : public CPDF_PageObjects {
+class CPDF_Form : public CPDF_PageObjectList {
  public:
   CPDF_Form(CPDF_Document* pDocument,
             CPDF_Dictionary* pPageResources,
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index 1c8a99ac7d..b4178a7f86 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -85,7 +85,7 @@ class CPDF_RenderContext {
   CPDF_RenderContext(CPDF_Document* pDoc, CPDF_PageRenderCache* pPageCache);
   ~CPDF_RenderContext();
 
-  void AppendObjectList(CPDF_PageObjects* pObjs,
+  void AppendObjectList(CPDF_PageObjectList* pObjs,
                         const CFX_Matrix* pObject2Device);
 
   void Render(CFX_RenderDevice* pDevice,
@@ -93,7 +93,7 @@ class CPDF_RenderContext {
               const CFX_Matrix* pFinalMatrix = NULL);
 
   void DrawObjectList(CFX_RenderDevice* pDevice,
-                      CPDF_PageObjects* pObjs,
+                      CPDF_PageObjectList* pObjs,
                       const CFX_Matrix* pObject2Device,
                       const CPDF_RenderOptions* pOptions);
 
diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h
index a7fc6bdfbb..77b0c29a6b 100644
--- a/core/include/fpdftext/fpdf_text.h
+++ b/core/include/fpdftext/fpdf_text.h
@@ -10,7 +10,7 @@
 #include "core/include/fpdfapi/fpdf_parser.h"
 
 class CPDF_Page;
-class CPDF_PageObjects;
+class CPDF_PageObjectList;
 class CPDF_TextObject;
 class IPDF_LinkExtract;
 class IPDF_ReflowedPage;
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp
index 1d18b5343d..b1bd277bb5 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp
@@ -666,7 +666,7 @@ void CPDF_FormObject::CalcBoundingBox() {
   m_Right = form_rect.right;
   m_Top = form_rect.top;
 }
-CPDF_PageObjects::CPDF_PageObjects()
+CPDF_PageObjectList::CPDF_PageObjectList()
     : m_pFormDict(nullptr),
       m_pFormStream(nullptr),
       m_pDocument(nullptr),
@@ -677,13 +677,13 @@ CPDF_PageObjects::CPDF_PageObjects()
       m_bHasImageMask(FALSE),
       m_ParseState(CONTENT_NOT_PARSED),
       m_ObjectList(128) {}
-CPDF_PageObjects::~CPDF_PageObjects() {
+CPDF_PageObjectList::~CPDF_PageObjectList() {
   FX_POSITION pos = m_ObjectList.GetHeadPosition();
   while (pos) {
     delete (CPDF_PageObject*)m_ObjectList.GetNext(pos);
   }
 }
-void CPDF_PageObjects::ContinueParse(IFX_Pause* pPause) {
+void CPDF_PageObjectList::ContinueParse(IFX_Pause* pPause) {
   if (!m_pParser) {
     return;
   }
@@ -693,14 +693,14 @@ void CPDF_PageObjects::ContinueParse(IFX_Pause* pPause) {
     m_pParser.reset();
   }
 }
-FX_POSITION CPDF_PageObjects::InsertObject(FX_POSITION posInsertAfter,
-                                           CPDF_PageObject* pNewObject) {
+FX_POSITION CPDF_PageObjectList::InsertObject(FX_POSITION posInsertAfter,
+                                              CPDF_PageObject* pNewObject) {
   if (!posInsertAfter) {
     return m_ObjectList.AddHead(pNewObject);
   }
   return m_ObjectList.InsertAfter(posInsertAfter, pNewObject);
 }
-int CPDF_PageObjects::GetObjectIndex(CPDF_PageObject* pObj) const {
+int CPDF_PageObjectList::GetObjectIndex(CPDF_PageObject* pObj) const {
   int index = 0;
   FX_POSITION pos = m_ObjectList.GetHeadPosition();
   while (pos) {
@@ -712,18 +712,18 @@ int CPDF_PageObjects::GetObjectIndex(CPDF_PageObject* pObj) const {
   }
   return -1;
 }
-CPDF_PageObject* CPDF_PageObjects::GetObjectByIndex(int index) const {
+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;
 }
-void CPDF_PageObjects::Transform(const CFX_Matrix& matrix) {
+void CPDF_PageObjectList::Transform(const CFX_Matrix& matrix) {
   FX_POSITION pos = m_ObjectList.GetHeadPosition();
   while (pos) {
     CPDF_PageObject* pObj = (CPDF_PageObject*)m_ObjectList.GetNext(pos);
     pObj->Transform(matrix);
   }
 }
-CFX_FloatRect CPDF_PageObjects::CalcBoundingBox() const {
+CFX_FloatRect CPDF_PageObjectList::CalcBoundingBox() const {
   if (m_ObjectList.GetCount() == 0) {
     return CFX_FloatRect(0, 0, 0, 0);
   }
@@ -748,7 +748,7 @@ CFX_FloatRect CPDF_PageObjects::CalcBoundingBox() const {
   }
   return CFX_FloatRect(left, bottom, right, top);
 }
-void CPDF_PageObjects::LoadTransInfo() {
+void CPDF_PageObjectList::LoadTransInfo() {
   if (!m_pFormDict) {
     return;
   }
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index 08b10e5500..c5e407d4ea 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -114,7 +114,7 @@ CPDF_StreamContentParser::CPDF_StreamContentParser(
     CPDF_Dictionary* pPageResources,
     CPDF_Dictionary* pParentResources,
     CFX_Matrix* pmtContentToUser,
-    CPDF_PageObjects* pObjList,
+    CPDF_PageObjectList* pObjList,
     CPDF_Dictionary* pResources,
     CPDF_Rect* pBBox,
     CPDF_ParseOptions* pOptions,
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h
index 49f7a0e42c..3d33387e2d 100644
--- a/core/src/fpdfapi/fpdf_page/pageint.h
+++ b/core/src/fpdfapi/fpdf_page/pageint.h
@@ -93,7 +93,7 @@ class CPDF_StreamContentParser {
                            CPDF_Dictionary* pPageResources,
                            CPDF_Dictionary* pParentResources,
                            CFX_Matrix* pmtContentToUser,
-                           CPDF_PageObjects* pObjList,
+                           CPDF_PageObjectList* pObjList,
                            CPDF_Dictionary* pResources,
                            CFX_FloatRect* pBBox,
                            CPDF_ParseOptions* pOptions,
@@ -101,7 +101,7 @@ class CPDF_StreamContentParser {
                            int level);
   ~CPDF_StreamContentParser();
 
-  CPDF_PageObjects* GetObjectList() const { return m_pObjectList; }
+  CPDF_PageObjectList* GetObjectList() const { return m_pObjectList; }
   CPDF_AllStates* GetCurStates() const { return m_pCurStates.get(); }
   FX_BOOL IsColored() const { return m_bColored; }
   const FX_FLOAT* GetType3Data() const { return m_Type3Data; }
@@ -235,7 +235,7 @@ class CPDF_StreamContentParser {
   CPDF_Dictionary* m_pPageResources;
   CPDF_Dictionary* m_pParentResources;
   CPDF_Dictionary* m_pResources;
-  CPDF_PageObjects* m_pObjectList;
+  CPDF_PageObjectList* m_pObjectList;
   int m_Level;
   CFX_Matrix m_mtContentToUser;
   CFX_FloatRect m_BBox;
@@ -297,7 +297,7 @@ class CPDF_ContentParser {
 
   ParseStatus m_Status;
   InternalStage m_InternalStage;
-  CPDF_PageObjects* m_pObjects;
+  CPDF_PageObjectList* m_pObjects;
   FX_BOOL m_bForm;
   CPDF_ParseOptions m_Options;
   CPDF_Type3Char* m_pType3Char;
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
index 6a821ec069..5222d69fde 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -240,7 +240,7 @@ FX_BOOL CPDF_RenderStatus::Initialize(CPDF_RenderContext* pContext,
   m_Transparency = transparency;
   return TRUE;
 }
-void CPDF_RenderStatus::RenderObjectList(const CPDF_PageObjects* pObjs,
+void CPDF_RenderStatus::RenderObjectList(const CPDF_PageObjectList* pObjs,
                                          const CFX_Matrix* pObj2Device) {
   CFX_FloatRect clip_rect = m_pDevice->GetClipBox();
   CFX_Matrix device2object;
@@ -968,7 +968,7 @@ CPDF_RenderContext::CPDF_RenderContext(CPDF_Document* pDoc,
       m_pPageCache(pPageCache),
       m_bFirstLayer(TRUE) {}
 CPDF_RenderContext::~CPDF_RenderContext() {}
-void CPDF_RenderContext::AppendObjectList(CPDF_PageObjects* pObjs,
+void CPDF_RenderContext::AppendObjectList(CPDF_PageObjectList* pObjs,
                                           const CFX_Matrix* pObject2Device) {
   _PDF_RenderItem* pItem = m_ContentList.AddSpace();
   pItem->m_pObjectList = pObjs;
@@ -1023,7 +1023,7 @@ void CPDF_RenderContext::Render(CFX_RenderDevice* pDevice,
   }
 }
 void CPDF_RenderContext::DrawObjectList(CFX_RenderDevice* pDevice,
-                                        CPDF_PageObjects* pObjs,
+                                        CPDF_PageObjectList* pObjs,
                                         const CFX_Matrix* pObject2Device,
                                         const CPDF_RenderOptions* pOptions) {
   AppendObjectList(pObjs, pObject2Device);
diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h
index 5530754ab0..3a81ba5587 100644
--- a/core/src/fpdfapi/fpdf_render/render_int.h
+++ b/core/src/fpdfapi/fpdf_render/render_int.h
@@ -93,7 +93,7 @@ class CPDF_DocRenderData {
 };
 struct _PDF_RenderItem {
  public:
-  CPDF_PageObjects* m_pObjectList;
+  CPDF_PageObjectList* m_pObjectList;
   CFX_Matrix m_Matrix;
 };
 
@@ -131,7 +131,7 @@ class CPDF_RenderStatus {
                      FX_ARGB fill_color = 0,
                      FX_DWORD GroupFamily = 0,
                      FX_BOOL bLoadMask = FALSE);
-  void RenderObjectList(const CPDF_PageObjects* pObjs,
+  void RenderObjectList(const CPDF_PageObjectList* pObjs,
                         const CFX_Matrix* pObj2Device);
   void RenderSingleObject(const CPDF_PageObject* pObj,
                           const CFX_Matrix* pObj2Device);
diff --git a/core/src/fpdftext/fpdf_text_search.cpp b/core/src/fpdftext/fpdf_text_search.cpp
index 80bf5ec99a..de38a7f540 100644
--- a/core/src/fpdftext/fpdf_text_search.cpp
+++ b/core/src/fpdftext/fpdf_text_search.cpp
@@ -296,7 +296,7 @@ FX_BOOL CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj,
   return FALSE;
 }
 void GetTextStream_Unicode(CFX_WideTextBuf& buffer,
-                           CPDF_PageObjects* pPage,
+                           CPDF_PageObjectList* pPage,
                            FX_BOOL bUseLF,
                            CFX_PtrArray* pObjArray) {
   CPDF_TextStream textstream(buffer, bUseLF, pObjArray);
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index bc3cc5bacf..acc9bfacc6 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/src/fpdftext/text_int.h
@@ -133,7 +133,7 @@ class CPDF_TextPage : public IPDF_TextPage {
 
   CPDFText_ParseOptions m_ParseOptions;
   CFX_WordArray m_CharIndex;
-  const CPDF_PageObjects* const m_pPage;
+  const CPDF_PageObjectList* const m_pPage;
   PAGECHAR_InfoArray m_charList;
   CFX_WideTextBuf m_TextBuf;
   PAGECHAR_InfoArray m_TempCharList;
@@ -241,7 +241,7 @@ FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst);
 void NormalizeString(CFX_WideString& str);
 void NormalizeCompositeChar(FX_WCHAR wChar, CFX_WideString& sDest);
 void GetTextStream_Unicode(CFX_WideTextBuf& buffer,
-                           CPDF_PageObjects* pPage,
+                           CPDF_PageObjectList* pPage,
                            FX_BOOL bUseLF,
                            CFX_PtrArray* pObjArray);
 
diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h
index a8f5bba870..59ac2b13ba 100644
--- a/fpdfsdk/include/fxedit/fx_edit.h
+++ b/fpdfsdk/include/fxedit/fx_edit.h
@@ -14,7 +14,7 @@
 class CFX_RenderDevice;
 class CPDF_Font;
 class CFX_Matrix;
-class CPDF_PageObjects;
+class CPDF_PageObjectList;
 class CPDF_Point;
 class CPDF_TextObject;
 class IFX_Edit;
@@ -458,19 +458,19 @@ class IFX_Edit {
                            const CPDF_Point& ptOffset,
                            const CPVT_WordRange* pRange);
   static void GeneratePageObjects(
-      CPDF_PageObjects* pPageObjects,
+      CPDF_PageObjectList* pPageObjects,
       IFX_Edit* pEdit,
       const CPDF_Point& ptOffset,
       const CPVT_WordRange* pRange,
       FX_COLORREF crText,
       CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray);
   static void GenerateRichPageObjects(
-      CPDF_PageObjects* pPageObjects,
+      CPDF_PageObjectList* pPageObjects,
       IFX_Edit* pEdit,
       const CPDF_Point& ptOffset,
       const CPVT_WordRange* pRange,
       CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray);
-  static void GenerateUnderlineObjects(CPDF_PageObjects* pPageObjects,
+  static void GenerateUnderlineObjects(CPDF_PageObjectList* pPageObjects,
                                        IFX_Edit* pEdit,
                                        const CPDF_Point& ptOffset,
                                        const CPVT_WordRange* pRange,
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h
index e7be15639d..7885331bc7 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h
@@ -110,10 +110,10 @@ class CPWL_Edit : public CPWL_EditCtrl, public IFX_Edit_OprNotify {
     m_pFillerNotify = pNotify;
   }
 
-  void GeneratePageObjects(CPDF_PageObjects* pPageObjects,
+  void GeneratePageObjects(CPDF_PageObjectList* pPageObjects,
                            const CPDF_Point& ptOffset,
                            CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray);
-  void GeneratePageObjects(CPDF_PageObjects* pPageObjects,
+  void GeneratePageObjects(CPDF_PageObjectList* pPageObjects,
                            const CPDF_Point& ptOffset);
 
  protected:
diff --git a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp
index 18687679c2..6cdcc84991 100644
--- a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp
+++ b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp
@@ -409,7 +409,7 @@ void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice,
   pDevice->RestoreState();
 }
 
-static void AddRectToPageObjects(CPDF_PageObjects* pPageObjs,
+static void AddRectToPageObjects(CPDF_PageObjectList* pPageObjs,
                                  FX_COLORREF crFill,
                                  const CPDF_Rect& rcFill) {
   CPDF_PathObject* pPathObj = new CPDF_PathObject;
@@ -429,7 +429,7 @@ static void AddRectToPageObjects(CPDF_PageObjects* pPageObjs,
   pPageObjs->InsertObject(pPageObjs->GetLastObjectPosition(), pPathObj);
 }
 
-static CPDF_TextObject* AddTextObjToPageObjects(CPDF_PageObjects* pPageObjs,
+static CPDF_TextObject* AddTextObjToPageObjects(CPDF_PageObjectList* pPageObjs,
                                                 FX_COLORREF crText,
                                                 CPDF_Font* pFont,
                                                 FX_FLOAT fFontSize,
@@ -468,7 +468,7 @@ static CPDF_TextObject* AddTextObjToPageObjects(CPDF_PageObjects* pPageObjs,
 }
 
 void IFX_Edit::GeneratePageObjects(
-    CPDF_PageObjects* pPageObjects,
+    CPDF_PageObjectList* pPageObjects,
     IFX_Edit* pEdit,
     const CPDF_Point& ptOffset,
     const CPVT_WordRange* pRange,
@@ -532,7 +532,7 @@ void IFX_Edit::GeneratePageObjects(
 }
 
 void IFX_Edit::GenerateRichPageObjects(
-    CPDF_PageObjects* pPageObjects,
+    CPDF_PageObjectList* pPageObjects,
     IFX_Edit* pEdit,
     const CPDF_Point& ptOffset,
     const CPVT_WordRange* pRange,
@@ -624,7 +624,7 @@ void IFX_Edit::GenerateRichPageObjects(
   }
 }
 
-void IFX_Edit::GenerateUnderlineObjects(CPDF_PageObjects* pPageObjects,
+void IFX_Edit::GenerateUnderlineObjects(CPDF_PageObjectList* pPageObjects,
                                         IFX_Edit* pEdit,
                                         const CPDF_Point& ptOffset,
                                         const CPVT_WordRange* pRange,
diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
index 8ddb7dfb6e..cbef23cc19 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
@@ -1168,7 +1168,7 @@ CPVT_WordRange CPWL_Edit::GetSameWordsRange(const CPVT_WordPlace& place,
 }
 
 void CPWL_Edit::GeneratePageObjects(
-    CPDF_PageObjects* pPageObjects,
+    CPDF_PageObjectList* pPageObjects,
     const CPDF_Point& ptOffset,
     CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray) {
   IFX_Edit::GeneratePageObjects(
@@ -1177,7 +1177,7 @@ void CPWL_Edit::GeneratePageObjects(
       ObjArray);
 }
 
-void CPWL_Edit::GeneratePageObjects(CPDF_PageObjects* pPageObjects,
+void CPWL_Edit::GeneratePageObjects(CPDF_PageObjectList* pPageObjects,
                                     const CPDF_Point& ptOffset) {
   CFX_ArrayTemplate<CPDF_TextObject*> ObjArray;
   IFX_Edit::GeneratePageObjects(