Issue #4692 - Move responsibility for engine reference from tasks to scheduler

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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <AdblockPlus.h>
 #include "FileSystemJsObject.h"
 #include "GlobalJsObject.h"
 #include "JsContext.h"
 #include "JsEngineInternal.h"
 #include "JsEngineTransition.h"
 #include "JsError.h"
-#include "Scheduler.h"
 #include "Utils.h"
 #include "WebRequestJsObject.h"
 
-const AdblockPlus::ImmediateSingleUseThreadType AdblockPlus::ImmediateSingleUseThread = {};
-
-class AdblockPlus::JsEngine::SchedulerImpl
-  : public SchedulerT<SingleUseWorker>
-{
-public:
-  SchedulerImpl() {} // = default;
-};
+const ImmediateSingleUseThreadType ImmediateSingleUseThread = {};
 
 namespace
 {
   v8::Handle<v8::Script> CompileScript(v8::Isolate* isolate,
     const std::string& source, const std::string& filename)
   {
     using AdblockPlus::Utils::ToV8String;
     const v8::Handle<v8::String> v8Source = ToV8String(isolate, source);
     if (filename.length())
     {
@@ skipping 44 matching lines @@
   isolate = v8::Isolate::New();
 }
 
 AdblockPlus::ScopedV8Isolate::~ScopedV8Isolate()
 {
   isolate->Dispose();
   isolate = nullptr;
 }
 
 AdblockPlus::JsEngine::JsEngine(const ScopedV8IsolatePtr& isolate)
-  : isolate(isolate),
-  scheduler(new SchedulerImpl()) // TODO: make_unique once available
+  : isolate(isolate)
 {}
 
 JsEngineInternal::JsEngineInternal(const AdblockPlus::ScopedV8IsolatePtr& isolate)
   : AdblockPlus::JsEngine(isolate),
   context(isolate->Get(),v8::Context::New(isolate->Get()))
 {
   /*
    * Enter v8 scope for our context so that we can initialize its global object.
    */
   const v8::Context::Scope contextScope(GetContextAsLocal());
@@ skipping 262 matching lines @@
 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name, 
                                               AdblockPlus::JsValuePtr value)
 {
   JsContext jsContext(shared_from_this());
   auto global = GetGlobalObject();
   if (!global)
     throw std::runtime_error("Global object cannot be null");
   global->SetProperty(name, value);
 }
 
-void AdblockPlus::JsEngine::Schedule(std::function<void()> task,
-                                     AdblockPlus::ImmediateSingleUseThreadType)
+void JsEngineInternal::ScheduleTaskInternal(std::shared_ptr<TaskFunctionInterface>&& body)
 {
   // The present version of the scheduler only does immediate and single-use
   // It does not, however, detach threads like the legacy thread behavior did.
-  scheduler->Run(task);
+  scheduler.Run(Task(this, std::move(body)));
 }
 
-void AdblockPlus::JsEngine::WaitForQuietScheduler()
+void JsEngineInternal::WaitForQuietScheduler()
 {
-  scheduler->JoinAll();
+  scheduler.JoinAll();
 }
 
 JsEngineInternal* ToInternal(AdblockPlus::JsEnginePtr p)
 {
   return static_cast<JsEngineInternal*>(p.get());
 }
 
 JsEngineInternal* ToInternal(AdblockPlus::JsEngine* p)
 {
   return static_cast<JsEngineInternal*>(p);
 }