Issue 3595 - Get rid of detached threads for setTimeout

src/GlobalJsObject.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 15 matching lines @@
 #include "GlobalJsObject.h"
 #include "ConsoleJsObject.h"
 #include "WebRequestJsObject.h"
 #include "Thread.h"
 #include "Utils.h"
 
 using namespace AdblockPlus;
 
 namespace
 {
-  class TimeoutThread : public Thread
-  {
-  public:
-    TimeoutThread(const JsEngine::TimerTask& timerTask)
-      : Thread(true), timerTask(timerTask)
-    {
-    }
-
-    void Run()
-    {
-      Sleep(timerTask.taskInfoIterator->delay);
-      if (auto jsEngine = timerTask.weakJsEngine.lock())
-        jsEngine->CallTimerTask(timerTask.taskInfoIterator);
-    }
-
-  private:
-    JsEngine::TimerTask timerTask;
-  };
-
   v8::Handle<v8::Value> SetTimeoutCallback(const v8::Arguments& arguments)
   {
-    TimeoutThread* timeoutThread;
     try
     {
-      auto jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
-      timeoutThread = new TimeoutThread(jsEngine->CreateTimerTask(arguments));
+      AdblockPlus::JsEngine::ScheduleTimer(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
     // clearTimeout(), we can save that for later.
     return v8::Undefined();
   }
 
   v8::Handle<v8::Value> TriggerEventCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
@@ skipping 19 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;
 }