Use a map for app::m_Timers

fpdfsdk/javascript/app.cpp

Index: fpdfsdk/javascript/app.cpp
diff --git a/fpdfsdk/javascript/app.cpp b/fpdfsdk/javascript/app.cpp
index 97c97eb89afeeedc796ad920163a118d8b2ce84e..573de4030abacc7dbc0c357f89f809d48e5cb71b 100644
--- a/fpdfsdk/javascript/app.cpp
+++ b/fpdfsdk/javascript/app.cpp
@@ -509,15 +509,18 @@ FX_BOOL app::setInterval(IJS_Context* cc,
 
   uint32_t dwInterval = params.size() > 1 ? params[1].ToInt(pRuntime) : 1000;
   CPDFDoc_Environment* pApp = pRuntime->GetReaderApp();
-  m_Timers.push_back(std::unique_ptr<GlobalTimer>(
-      new GlobalTimer(this, pApp, pRuntime, 0, script, dwInterval, 0)));
+
+  std::unique_ptr<GlobalTimer> timer(
+      new GlobalTimer(this, pApp, pRuntime, 0, script, dwInterval, 0));
+  GlobalTimer* timerRef = timer.get();
+  m_Timers[timerRef] = std::move(timer);
 
   v8::Local<v8::Object> pRetObj =
       pRuntime->NewFxDynamicObj(CJS_TimerObj::g_nObjDefnID);
   CJS_TimerObj* pJS_TimerObj =
       static_cast<CJS_TimerObj*>(pRuntime->GetObjectPrivate(pRetObj));
   TimerObj* pTimerObj = static_cast<TimerObj*>(pJS_TimerObj->GetEmbedObject());
-  pTimerObj->SetTimer(m_Timers.back().get());
+  pTimerObj->SetTimer(timerRef);
 
   vRet = CJS_Value(pRuntime, pRetObj);
   return TRUE;
@@ -543,8 +546,11 @@ FX_BOOL app::setTimeOut(IJS_Context* cc,
 
   uint32_t dwTimeOut = params.size() > 1 ? params[1].ToInt(pRuntime) : 1000;
   CPDFDoc_Environment* pApp = pRuntime->GetReaderApp();
-  m_Timers.push_back(std::unique_ptr<GlobalTimer>(
-      new GlobalTimer(this, pApp, pRuntime, 1, script, dwTimeOut, dwTimeOut)));
+
+  std::unique_ptr<GlobalTimer> timer(
+      new GlobalTimer(this, pApp, pRuntime, 1, script, dwTimeOut, dwTimeOut));
+  GlobalTimer* timerRef = timer.get();
+  m_Timers[timerRef] = std::move(timer);

[Tom Sepez, 2016/08/18 17:17:43]

This feels strange, mapping a pointer to itself, Why isn't this just
std::set<std::unique_ptr<GlobalTimer> > ???

[dsinclair, 2016/08/18 17:20:21]

If this was a set I'd have the same issue as before in that it would be a linear
search to find the GlobalTimer* in the remove method. I need the key to be the
pointer, but we want the unique_ptr for the memory cleanup happy-ness.

 
   v8::Local<v8::Object> pRetObj =
       pRuntime->NewFxDynamicObj(CJS_TimerObj::g_nObjDefnID);
@@ -553,7 +559,7 @@ FX_BOOL app::setTimeOut(IJS_Context* cc,
       static_cast<CJS_TimerObj*>(pRuntime->GetObjectPrivate(pRetObj));
 
   TimerObj* pTimerObj = static_cast<TimerObj*>(pJS_TimerObj->GetEmbedObject());
-  pTimerObj->SetTimer(m_Timers.back().get());
+  pTimerObj->SetTimer(timerRef);
 
   vRet = CJS_Value(pRuntime, pRetObj);
   return TRUE;
@@ -620,13 +626,7 @@ void app::TimerProc(GlobalTimer* pTimer) {
 }
 
 void app::CancelProc(GlobalTimer* pTimer) {
-  auto iter = std::find_if(m_Timers.begin(), m_Timers.end(),
-                           [pTimer](const std::unique_ptr<GlobalTimer>& that) {
-                             return pTimer == that.get();
-                           });
-
-  if (iter != m_Timers.end())
-    m_Timers.erase(iter);
+  m_Timers.erase(pTimer);
 }
 
 void app::RunJsScript(CJS_Runtime* pRuntime, const CFX_WideString& wsScript) {