Rename CPDF_PageObjects to CPDF_PageObjectList

fpdfsdk/src/fpdf_flatten.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 "public/fpdf_flatten.h"
 
 #include <algorithm>
 
@@ skipping 17 matching lines @@
     if (rect.left - rcPage.left < -10.000001f ||
         rect.right - rcPage.right > 10.000001f ||
         rect.top - rcPage.top > 10.000001f ||
         rect.bottom - rcPage.bottom < -10.000001f)
       return FALSE;
   }
 
   return TRUE;
 }
 
-FX_BOOL GetContentsRect(CPDF_Document* pDoc,
-                        CPDF_Dictionary* pDict,
-                        CPDF_RectArray* pRectArray) {
-  CPDF_Page* pPDFPage = new CPDF_Page;
+void GetContentsRect(CPDF_Document* pDoc,
+                     CPDF_Dictionary* pDict,
+                     CPDF_RectArray* pRectArray) {
+  std::unique_ptr<CPDF_Page> pPDFPage(new CPDF_Page);
   pPDFPage->Load(pDoc, pDict, FALSE);
   pPDFPage->ParseContent(nullptr);
 
-  FX_POSITION pos = pPDFPage->GetFirstObjectPosition();
-  while (pos) {
-    CPDF_PageObject* pPageObject = pPDFPage->GetNextObject(pos);
+  for (const auto& pPageObject : *pPDFPage) {

[Oliver Chang, 2016/01/21 23:58:46]

premature change?

     if (!pPageObject)
       continue;
 
     CPDF_Rect rc;
     rc.left = pPageObject->m_Left;
     rc.right = pPageObject->m_Right;
     rc.bottom = pPageObject->m_Bottom;
     rc.top = pPageObject->m_Top;
 
-    if (IsValiableRect(rc, pDict->GetRect("MediaBox"))) {
+    if (IsValiableRect(rc, pDict->GetRect("MediaBox")))
       pRectArray->Add(rc);
-    }
   }
-
-  delete pPDFPage;
-  return TRUE;
 }
 
 void ParserStream(CPDF_Dictionary* pPageDic,
                   CPDF_Dictionary* pStream,
                   CPDF_RectArray* pRectArray,
                   CPDF_ObjectArray* pObjectArray) {
   if (!pStream)
     return;
   CPDF_Rect rect;
   if (pStream->KeyExist("Rect"))
@@ skipping 440 matching lines @@
     pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE,
                          FALSE);
   }
   pPageDict->RemoveAt("Annots");
 
   ObjectArray.RemoveAll();
   RectArray.RemoveAll();
 
   return FLATTEN_SUCCESS;
 }