Issue #4694 - Add mutex protection to JS event handling

src/JsEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 96 matching lines @@
   /*
    * Enter v8 scope for our context so that we can initialize its global object.
    */
   const v8::Context::Scope contextScope(GetContextAsLocal());
   auto globalObject = GetGlobalObject();
   auto propertyName = AdblockPlus::Utils::ToV8String(GetIsolate(), "setTimeout");
   globalObject->Set(propertyName, MakeCallback(::CallbackForSetTimeout));
   // TODO: Move the rest of the global object initializations here
 }
 
+JsEngineInternal& AdblockPlus::JsEngine::Internal()
+{
+  return *static_cast<JsEngineInternal*>(this);
+}
+
 /**
  * \par Design Notes
  * It is technically necessary to construct JsEngine instances *only* within a factory.
  * Initialization requires that certain transient v8 scopes be set up 
  *   before initialization and torn down afterwards.
  * C++ has no syntax to use anything like a sentry object in the constructor itself.
  * Thus we need to establish v8 scope within every C++ scope that constructs an object.
  */
 AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::New(const AppInfo& appInfo, const ScopedV8IsolatePtr& isolate)
 {
@@ skipping 67 matching lines @@
   const v8::TryCatch tryCatch;
   const v8::Handle<v8::Script> script = CompileScript(GetIsolate(), source,
     filename);
   CheckTryCatch(tryCatch);
   v8::Local<v8::Value> result = script->Run();
   CheckTryCatch(tryCatch);
   return JsValuePtr(new JsValue(shared_from_this(), result));
 }
 
 void AdblockPlus::JsEngine::SetEventCallback(const std::string& eventName,
-    AdblockPlus::JsEngine::EventCallback callback)
+  AdblockPlus::JsEngine::EventCallback callback)
 {
-  eventCallbacks[eventName] = callback;
+  Internal().eventMan.Set(eventName, callback);
 }
 
 void AdblockPlus::JsEngine::RemoveEventCallback(const std::string& eventName)
 {
-  eventCallbacks.erase(eventName);
+  Internal().eventMan.Remove(eventName);
 }
 
 void AdblockPlus::JsEngine::TriggerEvent(const std::string& eventName, AdblockPlus::JsValueList& params)
 {
-  EventMap::iterator it = eventCallbacks.find(eventName);
-  if (it != eventCallbacks.end())
-    it->second(params);
+  Internal().eventMan.Trigger(eventName, params);
 }
 
 void AdblockPlus::JsEngine::Gc()
 {
   while (!v8::V8::IdleNotification());
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(const std::string& val)
 {
   const JsContext context(shared_from_this());
@@ skipping 147 matching lines @@
 
 JsEngineInternal* ToInternal(AdblockPlus::JsEnginePtr p)
 {
   return static_cast<JsEngineInternal*>(p.get());
 }
 
 JsEngineInternal* ToInternal(AdblockPlus::JsEngine* p)
 {
   return static_cast<JsEngineInternal*>(p);
 }