Issue 4692 - Dont' keep a strong reference from timer thread

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 74 matching lines @@
 }
 
 JsEngine::TimerTask JsEngine::CreateTimerTask(const v8::Arguments& arguments)
 {
   if (arguments.Length() < 2)
     throw std::runtime_error("setTimeout requires at least 2 parameters");
 
   if (!arguments[0]->IsFunction())
     throw std::runtime_error("First argument to setTimeout must be a function");
 
-  auto ii_timerTaskInfo = timerTaskInfos.emplace(timerTaskInfos.end());
-  ii_timerTaskInfo->delay = arguments[1]->IntegerValue();
+  auto timerTaskInfoIterator = timerTaskInfos.emplace(timerTaskInfos.end());
+  timerTaskInfoIterator->delay = arguments[1]->IntegerValue();
 
   for (int i = 0; i < arguments.Length(); i++)
-    ii_timerTaskInfo->arguments.emplace_back(new v8::Persistent<v8::Value>(GetIsolate(), arguments[i]));
-  TimerTask retValue = { shared_from_this(), ii_timerTaskInfo };
+    timerTaskInfoIterator->arguments.emplace_back(new v8::Persistent<v8::Value>(GetIsolate(), arguments[i]));
+  TimerTask retValue = { shared_from_this(), timerTaskInfoIterator };
   return retValue;
 }
 
-void JsEngine::CallTimerTask(TimerTaskInfos::const_iterator ii_taskInfo)
-{
-  const JsContext context(shared_from_this());
-  JsValue callback(shared_from_this(), v8::Local<v8::Value>::New(GetIsolate(), *ii_taskInfo->arguments[0]));
+void JsEngine::CallTimerTask(TimerTaskInfos::const_iterator timerTaskInfoIterator)
+{
+  const JsContext context(shared_from_this());
+  JsValue callback(shared_from_this(), v8::Local<v8::Value>::New(GetIsolate(), *timerTaskInfoIterator->arguments[0]));
   JsValueList callbackArgs;
-  for (int i = 2; i < ii_taskInfo->arguments.size(); i++)
+  for (int i = 2; i < timerTaskInfoIterator->arguments.size(); i++)
     callbackArgs.emplace_back(new JsValue(shared_from_this(),
-    v8::Local<v8::Value>::New(GetIsolate(), *ii_taskInfo->arguments[i])));
+    v8::Local<v8::Value>::New(GetIsolate(), *timerTaskInfoIterator->arguments[i])));
   callback.Call(callbackArgs);
-  timerTaskInfos.erase(ii_taskInfo);
+  timerTaskInfos.erase(timerTaskInfoIterator);
 }
 
 AdblockPlus::JsEngine::JsEngine(const ScopedV8IsolatePtr& isolate)
   : isolate(isolate)
 {
 }
 
 AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::New(const AppInfo& appInfo, const ScopedV8IsolatePtr& isolate)
 {
   JsEnginePtr result(new JsEngine(isolate));
@@ skipping 186 matching lines @@
 
 
 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name, 
                                               AdblockPlus::JsValuePtr value)
 {
   auto global = GetGlobalObject();
   if (!global)
     throw std::runtime_error("Global object cannot be null");
   global->SetProperty(name, value);
 }