Merge to XFA: Use std::set<> to track active event handlers.

fpdfsdk/src/javascript/JS_Context.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 "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_EventHandler.h"
 #include "../../include/javascript/JS_Runtime.h"
@@ skipping 29 matching lines @@
   v8::Local<v8::Context> context = m_pRuntime->NewJSContext();
   v8::Context::Scope context_scope(context);
 
   if (m_bBusy) {
     info = JSGetStringFromID(this, IDS_STRING_JSBUSY);
     return FALSE;
   }
   m_bBusy = TRUE;
 
   ASSERT(m_pEventHandler->IsValid());
-  if (!m_pRuntime->AddEventToLoop(m_pEventHandler->TargetName(),
-                                  m_pEventHandler->EventType())) {
+  CJS_Runtime::FieldEvent event(m_pEventHandler->TargetName(),
+                                m_pEventHandler->EventType());
+  if (!m_pRuntime->AddEventToSet(event)) {
     info = JSGetStringFromID(this, IDS_STRING_JSEVENT);
     return FALSE;
   }
 
   FXJSErr error = {NULL, NULL, 0};
   int nRet = 0;
   if (script.GetLength() > 0) {
     nRet = FXJS_Execute(m_pRuntime->GetIsolate(), this, script.c_str(),
                         script.GetLength(), &error);
   }
 
   if (nRet < 0) {
     CFX_WideString sLine;
     sLine.Format(L"[ Line: %05d { %s } ] : %s", error.linnum - 1, error.srcline,
                  error.message);
     info += sLine;
   } else {
     info = JSGetStringFromID(this, IDS_STRING_RUN);
   }
 
-  m_pRuntime->RemoveEventInLoop(m_pEventHandler->TargetName(),
-                                m_pEventHandler->EventType());
-
+  m_pRuntime->RemoveEventFromSet(event);
   m_pEventHandler->Destroy();
   m_bBusy = FALSE;
 
   return nRet >= 0;
 }
 
 void CJS_Context::OnApp_Init() {
   m_pEventHandler->OnApp_Init();
 }
 
@@ skipping 195 matching lines @@
 }
 
 void CJS_Context::OnBatchExec(CPDFSDK_Document* pTarget) {
   m_pEventHandler->OnBatchExec(pTarget);
 }
 
 void CJS_Context::OnMenu_Exec(CPDFSDK_Document* pTarget,
                               const CFX_WideString& strTargetName) {
   m_pEventHandler->OnMenu_Exec(pTarget, strTargetName);
 }