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

src/GlobalJsObject.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 18 matching lines @@
 #include "Thread.h"
 #include "Utils.h"
 
 using namespace AdblockPlus;
 
 namespace
 {
   class TimeoutThread : public Thread
   {
   public:
-    TimeoutThread(JsValueList& arguments)
+    TimeoutThread(const JsEngine::TimerTask& timerTask)
       : Thread(true)
+      , timerTask(timerTask)

[Oleksandr, 2017/03/24 12:15:25]

Nit: I think our coding style would put a comma on the previous line

[sergei, 2017/03/24 12:34:39]

Done.

     {
-      if (arguments.size() < 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");
-
-      function = arguments[0];
-      delay = arguments[1]->AsInt();
-      for (size_t i = 2; i < arguments.size(); i++)
-        functionArguments.push_back(arguments[i]);
     }
 
     void Run()
     {
-      Sleep(delay);
-
-      function->Call(functionArguments);
+      Sleep(timerTask.ii_taskInfo->delay);
+      if (auto jsEngine = timerTask.weakJsEngine.lock())
+        jsEngine->CallTimerTask(timerTask.ii_taskInfo);
     }
 
   private:
-    JsValuePtr function;
-    int delay;
-    JsValueList functionArguments;
+    JsEngine::TimerTask timerTask;
   };
 
   v8::Handle<v8::Value> SetTimeoutCallback(const v8::Arguments& arguments)
   {
     TimeoutThread* timeoutThread;
     try
     {
-      AdblockPlus::JsValueList converted =
-          AdblockPlus::JsEngine::FromArguments(arguments)
-          ->ConvertArguments(arguments);
-      timeoutThread = new TimeoutThread(converted);
+      auto jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
+      timeoutThread = new TimeoutThread(jsEngine->CreateTimerTask(arguments));
     }
     catch (const std::exception& e)
     {
       v8::Isolate* isolate = arguments.GetIsolate();
       return v8::ThrowException(Utils::ToV8String(isolate, e.what()));
     }
     timeoutThread->Start();
 
     // We should actually return the timer ID here, which could be
     // used via clearTimeout(). But since we don't seem to need
@@ skipping 26 matching lines @@
   obj->SetProperty("_fileSystem",
       FileSystemJsObject::Setup(jsEngine, jsEngine->NewObject()));
   obj->SetProperty("_webRequest",
       WebRequestJsObject::Setup(jsEngine, jsEngine->NewObject()));
   obj->SetProperty("console",
       ConsoleJsObject::Setup(jsEngine, jsEngine->NewObject()));
   obj->SetProperty("_appInfo",
       AppInfoJsObject::Setup(jsEngine, appInfo, jsEngine->NewObject()));
   return obj;
 }