Issue 4907 - Update v8 to 5.7.278 in libadblockplus

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
 {
-  v8::Handle<v8::Value> SetTimeoutCallback(const v8::Arguments& arguments)
+  void SetTimeoutCallback(const v8::FunctionCallbackInfo<v8::Value>& arguments)
   {
     try
     {
       AdblockPlus::JsEngine::ScheduleTimer(arguments);
     }
     catch (const std::exception& e)
     {
       v8::Isolate* isolate = arguments.GetIsolate();
-      return v8::ThrowException(Utils::ToV8String(isolate, e.what()));
+      return Utils::ThrowException(isolate, e.what());
     }
 
     // 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)
+  void TriggerEventCallback(const v8::FunctionCallbackInfo<v8::Value>& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
     AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
     if (converted.size() < 1)
     {
       v8::Isolate* isolate = arguments.GetIsolate();
-      return v8::ThrowException(Utils::ToV8String(isolate,
-      "_triggerEvent expects at least one parameter"));
+      return Utils::ThrowException(isolate, "_triggerEvent expects at least one parameter");
     }
     std::string eventName = converted.front().AsString();
     converted.erase(converted.cbegin());
     jsEngine->TriggerEvent(eventName, move(converted));
-    return v8::Undefined();
   }
 }
 
 JsValue& GlobalJsObject::Setup(JsEngine& jsEngine, const AppInfo& appInfo,
     JsValue& obj)
 {
   obj.SetProperty("setTimeout", jsEngine.NewCallback(::SetTimeoutCallback));
   obj.SetProperty("_triggerEvent", jsEngine.NewCallback(::TriggerEventCallback));
   auto value = jsEngine.NewObject();
   obj.SetProperty("_fileSystem", FileSystemJsObject::Setup(jsEngine, value));
   value = jsEngine.NewObject();
   obj.SetProperty("_webRequest", WebRequestJsObject::Setup(jsEngine, value));
   value = jsEngine.NewObject();
   obj.SetProperty("console", ConsoleJsObject::Setup(jsEngine, value));
   value = jsEngine.NewObject();
   obj.SetProperty("_appInfo", AppInfoJsObject::Setup(appInfo, value));
   return obj;
 }