Remove CFX_DWordArray from Document.h

fpdfsdk/javascript/Document.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 "fpdfsdk/javascript/Document.h"
 
 #include <vector>
 
@@ skipping 140 matching lines @@
  */
 
 Document::Document(CJS_Object* pJSObject)
     : CJS_EmbedObj(pJSObject),
       m_isolate(NULL),
       m_pDocument(NULL),
       m_cwBaseURL(L""),
       m_bDelay(FALSE) {}
 
 Document::~Document() {
-  for (int i = 0; i < m_DelayData.GetSize(); i++) {
-    delete m_DelayData.GetAt(i);
-  }
-
-  m_DelayData.RemoveAll();
 }
 
 // the total number of fileds in document.
 FX_BOOL Document::numFields(IJS_Context* cc,
                             CJS_PropValue& vp,
                             CFX_WideString& sError) {
   if (vp.IsSetting()) {
     CJS_Context* pContext = static_cast<CJS_Context*>(cc);
     sError = JSGetStringFromID(pContext, IDS_STRING_JSREADONLY);
     return FALSE;
@@ skipping 682 matching lines @@
                         CJS_PropValue& vp,
                         CFX_WideString& sError) {
   if (vp.IsGetting()) {
     vp << m_bDelay;
   } else {
     if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY))
       return FALSE;
 
     vp >> m_bDelay;
     if (m_bDelay) {
-      for (int i = 0, sz = m_DelayData.GetSize(); i < sz; i++)
-        delete m_DelayData.GetAt(i);
-
-      m_DelayData.RemoveAll();
+      m_DelayData.clear();
     } else {
-      CFX_ArrayTemplate<CJS_DelayData*> DelayDataToProcess;
-      for (int i = 0, sz = m_DelayData.GetSize(); i < sz; i++) {
-        if (CJS_DelayData* pData = m_DelayData.GetAt(i)) {
-          DelayDataToProcess.Add(pData);
-          m_DelayData.SetAt(i, NULL);
-        }
-      }
-      m_DelayData.RemoveAll();
-      for (int i = 0, sz = DelayDataToProcess.GetSize(); i < sz; i++) {
-        CJS_DelayData* pData = DelayDataToProcess.GetAt(i);
-        Field::DoDelay(m_pDocument, pData);
-        DelayDataToProcess.SetAt(i, NULL);
-        delete pData;
-      }
+      std::list<std::unique_ptr<CJS_DelayData>> DelayDataToProcess;
+      DelayDataToProcess.swap(m_DelayData);
+      for (const auto& pData : DelayDataToProcess)
+        Field::DoDelay(m_pDocument, pData.get());
     }
   }
   return TRUE;
 }
 
 FX_BOOL Document::keywords(IJS_Context* cc,
                            CJS_PropValue& vp,
                            CFX_WideString& sError) {
   CPDF_Dictionary* pDictionary = m_pDocument->GetPDFDocument()->GetInfo();
   if (!pDictionary)
@@ skipping 693 matching lines @@
 
 FX_BOOL Document::getURL(IJS_Context* cc,
                          const std::vector<CJS_Value>& params,
                          CJS_Value& vRet,
                          CFX_WideString& sError) {
   // Unsafe, not supported.
   return TRUE;
 }
 
 void Document::AddDelayData(CJS_DelayData* pData) {
-  m_DelayData.Add(pData);
+  m_DelayData.push_back(std::unique_ptr<CJS_DelayData>(pData));
 }
 
 void Document::DoFieldDelay(const CFX_WideString& sFieldName,
                             int nControlIndex) {
-  CFX_DWordArray DelArray;
-  CFX_ArrayTemplate<CJS_DelayData*> DelayDataForFieldAndControlIndex;
-
-  for (int i = 0, sz = m_DelayData.GetSize(); i < sz; i++) {
-    if (CJS_DelayData* pData = m_DelayData.GetAt(i)) {
-      if (pData->sFieldName == sFieldName &&
-          pData->nControlIndex == nControlIndex) {
-        DelayDataForFieldAndControlIndex.Add(pData);
-        m_DelayData.SetAt(i, NULL);
-        DelArray.Add(i);
-      }
+  std::vector<std::unique_ptr<CJS_DelayData>> DelayDataForFieldAndControlIndex;
+  auto iter = m_DelayData.begin();
+  while (iter != m_DelayData.end()) {
+    auto old = iter++;
+    if ((*old)->sFieldName == sFieldName &&
+        (*old)->nControlIndex == nControlIndex) {
+      DelayDataForFieldAndControlIndex.push_back(std::move(*old));
+      m_DelayData.erase(old);
     }
   }
 
-  for (int j = DelArray.GetSize() - 1; j >= 0; j--) {
-    m_DelayData.RemoveAt(DelArray[j]);
-  }
-
-  for (int i = 0, sz = DelayDataForFieldAndControlIndex.GetSize(); i < sz;
-       i++) {
-    CJS_DelayData* pData = DelayDataForFieldAndControlIndex.GetAt(i);
-    Field::DoDelay(m_pDocument, pData);
-    DelayDataForFieldAndControlIndex.SetAt(i, NULL);
-    delete pData;
-  }
+  for (const auto& pData : DelayDataForFieldAndControlIndex)
+    Field::DoDelay(m_pDocument, pData.get());
 }
 
 CJS_Document* Document::GetCJSDoc() const {
   return static_cast<CJS_Document*>(m_pJSObject);
 }