Get rid of CFX_ArrayTemplate<CPDF_Object*>

core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp

 // Copyright 2016 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 "core/fpdfapi/edit/cpdf_pagecontentgenerator.h"
 
 #include "core/fpdfapi/edit/cpdf_creator.h"
 #include "core/fpdfapi/page/cpdf_docpagedata.h"
@@ skipping 16 matching lines @@
 }
 
 CPDF_PageContentGenerator::CPDF_PageContentGenerator(CPDF_Page* pPage)
     : m_pPage(pPage), m_pDocument(m_pPage->m_pDocument) {
   for (const auto& pObj : *pPage->GetPageObjectList())
     InsertPageObject(pObj.get());
 }
 
 CPDF_PageContentGenerator::~CPDF_PageContentGenerator() {}
 
-FX_BOOL CPDF_PageContentGenerator::InsertPageObject(
-    CPDF_PageObject* pPageObject) {
-  return pPageObject && m_pageObjects.Add(pPageObject);
+void CPDF_PageContentGenerator::InsertPageObject(CPDF_PageObject* pPageObject) {
+  if (pPageObject)
+    m_pageObjects.push_back(pPageObject);
 }
 
 void CPDF_PageContentGenerator::GenerateContent() {
   CFX_ByteTextBuf buf;
   CPDF_Dictionary* pPageDict = m_pPage->m_pFormDict;
-  for (int i = 0; i < m_pageObjects.GetSize(); ++i) {
-    CPDF_PageObject* pPageObj = m_pageObjects[i];
-    if (!pPageObj || !pPageObj->IsImage()) {
-      continue;
-    }
-    ProcessImage(buf, pPageObj->AsImage());
+  for (CPDF_PageObject* pPageObj : m_pageObjects) {
+    if (pPageObj && pPageObj->IsImage())

[Lei Zhang, 2016/10/11 23:49:51]

Don't we already know |pPageObj| won't be nullptr since InsertPageObject() above
is the only place that appends to the vector?

Can this be:

for (CPDF_PageObject* pPageObj : m_pageObjects) {
  auto* pImageObj = pPageObj->AsImage();
  if (pImageObj)
    ProcessImage(buf, pImageObj);
}

[Tom Sepez, 2016/10/12 16:17:38]

Done.

+      ProcessImage(buf, pPageObj->AsImage());
   }
   CPDF_Object* pContent =
       pPageDict ? pPageDict->GetDirectObjectFor("Contents") : nullptr;
   if (pContent)
     pPageDict->RemoveFor("Contents");
 
   CPDF_Stream* pStream = new CPDF_Stream;
   pStream->SetData(buf.GetBuffer(), buf.GetLength());
   pPageDict->SetReferenceFor("Contents", m_pDocument,
                              m_pDocument->AddIndirectObject(pStream));
@@ skipping 109 matching lines @@
   } else if (CPDF_Stream* pStream = pContent->AsStream()) {
     CPDF_StreamAcc contentStream;
     contentStream.LoadAllData(pStream);
     ProcessForm(buf, contentStream.GetData(), contentStream.GetSize(), matrix);
   }
   CPDF_Stream* pStream = new CPDF_Stream;
   pStream->SetData(buf.GetBuffer(), buf.GetLength());
   m_pPage->m_pFormDict->SetReferenceFor(
       "Contents", m_pDocument, m_pDocument->AddIndirectObject(pStream));
 }