Get rid of CFX_ArrayTemplate<CPDF_Object*>

core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp

Index: core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index 66a47406f5a6ee96a1fe166238bcea2a21269d65..a7b22e995e877c111a57f719f35c4767a41e6355 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -34,20 +34,17 @@ CPDF_PageContentGenerator::CPDF_PageContentGenerator(CPDF_Page* pPage)
 
 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;