use std::vector in more places in JavaScript bindings code.

fpdfsdk/javascript/JS_Runtime.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/JS_Runtime.h"
 
+#include <algorithm>
+
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "fpdfsdk/include/javascript/IJavaScript.h"
 #include "fpdfsdk/javascript/Consts.h"
 #include "fpdfsdk/javascript/Document.h"
 #include "fpdfsdk/javascript/Field.h"
 #include "fpdfsdk/javascript/Icon.h"
 #include "fpdfsdk/javascript/JS_Context.h"
 #include "fpdfsdk/javascript/JS_Define.h"
 #include "fpdfsdk/javascript/JS_EventHandler.h"
 #include "fpdfsdk/javascript/JS_GlobalData.h"
@@ skipping 91 matching lines @@
 #endif
   CJS_Context* pContext = (CJS_Context*)NewContext();
   FXJS_InitializeRuntime(GetIsolate(), this, &m_context, &m_StaticObjects);
   ReleaseContext(pContext);
 }
 
 CJS_Runtime::~CJS_Runtime() {
   for (auto* obs : m_observers)
     obs->OnDestroyed();
 
-  for (int i = 0, sz = m_ContextArray.GetSize(); i < sz; i++)
-    delete m_ContextArray.GetAt(i);
-
-  m_ContextArray.RemoveAll();
+  m_ContextArray.clear();
   m_ConstArrays.clear();
   FXJS_ReleaseRuntime(GetIsolate(), &m_context, &m_StaticObjects);
 
-  m_pApp = NULL;
   m_pDocument = NULL;

[dsinclair, 2016/03/28 18:57:33]

This isn't needed either as we're destructing, yea?

[Tom Sepez, 2016/03/28 23:47:18]

Done.

   m_context.Reset();
 
   if (m_isolateManaged)
     m_isolate->Dispose();
 }
 
 void CJS_Runtime::DefineJSObjects() {
   v8::Isolate::Scope isolate_scope(GetIsolate());
 #ifdef PDF_ENABLE_XFA
   v8::Locker locker(GetIsolate());
@@ skipping 37 matching lines @@
   CJS_PublicMethods::DefineJSObjects(GetIsolate());
   CJS_GlobalConsts::DefineJSObjects(this);
   CJS_GlobalArrays::DefineJSObjects(this);
 
   // ObjDefIDs 21 - 22.
   CJS_TimerObj::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_DYNAMIC);
   CJS_PrintParamsObj::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_DYNAMIC);
 }
 
 IJS_Context* CJS_Runtime::NewContext() {
-  CJS_Context* p = new CJS_Context(this);
-  m_ContextArray.Add(p);
-  return p;
+  m_ContextArray.push_back(std::unique_ptr<CJS_Context>(new CJS_Context(this)));
+  return m_ContextArray.back().get();
 }
 
 void CJS_Runtime::ReleaseContext(IJS_Context* pContext) {
-  CJS_Context* pJSContext = (CJS_Context*)pContext;
-
-  for (int i = 0, sz = m_ContextArray.GetSize(); i < sz; i++) {
-    if (pJSContext == m_ContextArray.GetAt(i)) {
-      delete pJSContext;
-      m_ContextArray.RemoveAt(i);
-      break;
+  for (auto it = m_ContextArray.begin(); it != m_ContextArray.end(); ++it) {
+    if (it->get() == static_cast<CJS_Context*>(pContext)) {
+      m_ContextArray.erase(it);
+      return;
     }
   }
 }
 
 IJS_Context* CJS_Runtime::GetCurrentContext() {
-  if (!m_ContextArray.GetSize())
-    return NULL;
-  return m_ContextArray.GetAt(m_ContextArray.GetSize() - 1);
+  return m_ContextArray.empty() ? nullptr : m_ContextArray.back().get();
 }
 
 void CJS_Runtime::SetReaderDocument(CPDFSDK_Document* pReaderDoc) {
   if (m_pDocument != pReaderDoc) {
     v8::Isolate::Scope isolate_scope(m_isolate);
 #ifdef PDF_ENABLE_XFA
     v8::Locker locker(m_isolate);
 #endif
     v8::HandleScope handle_scope(m_isolate);
     v8::Local<v8::Context> context =
@@ skipping 119 matching lines @@
 #endif
 void CJS_Runtime::AddObserver(Observer* observer) {
   ASSERT(!pdfium::ContainsKey(m_observers, observer));
   m_observers.insert(observer);
 }
 
 void CJS_Runtime::RemoveObserver(Observer* observer) {
   ASSERT(pdfium::ContainsKey(m_observers, observer));
   m_observers.erase(observer);
 }