Merge to XFA: Rename CPDF_PageObjects to CPDF_PageObjectList

core/include/fpdfapi/fpdf_page.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_INCLUDE_FPDFAPI_FPDF_PAGE_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
 
 #include <memory>
 
 #include "core/include/fpdfapi/fpdf_parser.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxge/fx_dib.h"
 
 class CPDF_Page;
 class CPDF_Form;
 class CPDF_ParseOptions;
 class CPDF_PageObject;
 class CPDF_PageRenderCache;
 class CPDF_StreamFilter;
 class CPDF_AllStates;
 class CPDF_ContentParser;
 class CPDF_StreamContentParser;
 #define PDFTRANS_GROUP 0x0100
 #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);
 
   FX_BOOL IsParsed() const { return m_ParseState == CONTENT_PARSED; }
 
   FX_POSITION GetFirstObjectPosition() const {
     return m_ObjectList.GetHeadPosition();
   }
 
   FX_POSITION GetLastObjectPosition() const {
@@ skipping 46 matching lines @@
 
   void LoadTransInfo();
 
   FX_BOOL m_bBackgroundAlphaNeeded;
   FX_BOOL m_bHasImageMask;
   ParseState m_ParseState;
   std::unique_ptr<CPDF_ContentParser> m_pParser;
   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();
 
   void Load(CPDF_Document* pDocument,
             CPDF_Dictionary* pPageDict,
             FX_BOOL bPageCache = TRUE);
 
   void ParseContent(CPDF_ParseOptions* pOptions);
 
@@ skipping 25 matching lines @@
   CPDF_ParseOptions();
 
   FX_BOOL m_bTextOnly;
 
   FX_BOOL m_bMarkedContent;
 
   FX_BOOL m_bSeparateForm;
 
   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,
             CPDF_Stream* pFormStream,
             CPDF_Dictionary* pParentResources = NULL);
 
   ~CPDF_Form();
 
   void StartParse(CPDF_AllStates* pGraphicStates,
                   CFX_Matrix* pParentMatrix,
@@ skipping 25 matching lines @@
                    CFX_Matrix& matrix);
   CFX_ByteString RealizeResource(CPDF_Object* pResourceObj,
                                  const FX_CHAR* szType);
 
   CPDF_Page* m_pPage;
   CPDF_Document* m_pDocument;
   CFX_ArrayTemplate<CPDF_PageObject*> m_pageObjects;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_