Issue 5450 - introduce the Platform class

src/JsEngine.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
  * 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 "GlobalJsObject.h"
 #include "JsContext.h"
 #include "JsError.h"
 #include "Utils.h"
-#include "DefaultTimer.h"
-#include "DefaultWebRequest.h"
-#include "DefaultFileSystem.h"
 #include <libplatform/libplatform.h>
+#include <AdblockPlus/Platform.h>
 
 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 27 matching lines @@
     }
     v8::Platform* platform;
   public:
     static void Init()
     {
       // it's threadsafe since C++11 and it will be instantiated only once and
       // destroyed at the application exit
       static V8Initializer initializer;
     }
   };
-
-  void DummyScheduler(const AdblockPlus::SchedulerTask& task)
-  {
-    std::thread(task).detach();
-  }
 }
 
 using namespace AdblockPlus;
 
-TimerPtr AdblockPlus::CreateDefaultTimer()
-{
-  return TimerPtr(new DefaultTimer());
-}
-
-FileSystemPtr AdblockPlus::CreateDefaultFileSystem(const Scheduler& scheduler)
-{
-  return FileSystemPtr(new DefaultFileSystem(scheduler, std::unique_ptr<DefaultFileSystemSync>(new DefaultFileSystemSync())));
-}
-
-WebRequestPtr AdblockPlus::CreateDefaultWebRequest(const Scheduler& scheduler)
-{
-  return WebRequestPtr(new DefaultWebRequest(scheduler, std::unique_ptr<DefaultWebRequestSync>(new DefaultWebRequestSync())));
-}
-
-LogSystemPtr AdblockPlus::CreateDefaultLogSystem()
-{
-  return LogSystemPtr(new DefaultLogSystem());
-}
-
 AdblockPlus::ScopedV8Isolate::ScopedV8Isolate()
 {
   V8Initializer::Init();
   v8::Isolate::CreateParams isolateParams;
   isolateParams.array_buffer_allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
   isolate = v8::Isolate::New(isolateParams);
 }
 
 AdblockPlus::ScopedV8Isolate::~ScopedV8Isolate()
 {
@@ skipping 17 matching lines @@
   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 jsValueArguments = jsEngine->ConvertArguments(arguments);
   auto timerParamsID = jsEngine->StoreJsValues(jsValueArguments);
 
   std::weak_ptr<JsEngine> weakJsEngine = jsEngine;
-  jsEngine->timer->SetTimer(std::chrono::milliseconds(arguments[1]->IntegerValue()), [weakJsEngine, timerParamsID]
+  jsEngine->platform.GetTimer().SetTimer(std::chrono::milliseconds(arguments[1]->IntegerValue()), [weakJsEngine, timerParamsID]
   {
     if (auto jsEngine = weakJsEngine.lock())
       jsEngine->CallTimerTask(timerParamsID);
   });
 }
 
 void JsEngine::CallTimerTask(const JsWeakValuesID& timerParamsID)
 {
   auto timerParams = TakeJsValues(timerParamsID);
   JsValue callback = std::move(timerParams[0]);
 
   timerParams.erase(timerParams.begin()); // remove callback placeholder
   timerParams.erase(timerParams.begin()); // remove timeout param
   callback.Call(timerParams);
 }
 
-AdblockPlus::JsEngine::JsEngine(TimerPtr timer, FileSystemPtr fileSystem,
-  WebRequestPtr webRequest, LogSystemPtr logSystem)
-  : fileSystem(std::move(fileSystem))
-  , timer(std::move(timer))
-  , logSystem(std::move(logSystem))
-  , webRequest(std::move(webRequest))
+AdblockPlus::JsEngine::JsEngine(Platform& platform)
+  : platform(platform)
 {
 }
 
 AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::New(const AppInfo& appInfo,
-  TimerPtr timer, FileSystemPtr fileSystem, WebRequestPtr webRequest, LogSystemPtr logSystem)
+  Platform& platform)
 {
-  JsEnginePtr result(new JsEngine(timer ? std::move(timer) : CreateDefaultTimer(),
-    fileSystem ? std::move(fileSystem) : CreateDefaultFileSystem(::DummyScheduler),
-    webRequest ? std::move(webRequest) : CreateDefaultWebRequest(::DummyScheduler),
-    logSystem ? std::move(logSystem) : CreateDefaultLogSystem()));
+  JsEnginePtr result(new JsEngine(platform));
 
   const v8::Locker locker(result->GetIsolate());
   const v8::Isolate::Scope isolateScope(result->GetIsolate());
   const v8::HandleScope handleScope(result->GetIsolate());
 
   result->context.reset(new v8::Global<v8::Context>(result->GetIsolate(),
     v8::Context::New(result->GetIsolate())));
   auto global = result->GetGlobalObject();
   AdblockPlus::GlobalJsObject::Setup(*result, appInfo, global);
   return result;
@@ skipping 142 matching lines @@
 
 AdblockPlus::JsValueList AdblockPlus::JsEngine::ConvertArguments(const v8::FunctionCallbackInfo<v8::Value>& arguments)
 {
   const JsContext context(*this);
   JsValueList list;
   for (int i = 0; i < arguments.Length(); i++)
     list.push_back(JsValue(shared_from_this(), arguments[i]));
   return list;
 }
 
-AdblockPlus::FileSystemPtr AdblockPlus::JsEngine::GetAsyncFileSystem() const
-{
-  return fileSystem;
-}
-
-AdblockPlus::LogSystem& AdblockPlus::JsEngine::GetLogSystem()
-{
-  return *logSystem;
-}
-
 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name,
                                               const AdblockPlus::JsValue& value)
 {
   auto global = GetGlobalObject();
   global.SetProperty(name, value);
 }