Issue 4907 - Update v8 to 5.7.278 in libadblockplus

src/WebRequestJsObject.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 <map>
 #include <AdblockPlus/IWebRequest.h>
 
 #include "JsContext.h"
 #include "Utils.h"
 #include "WebRequestJsObject.h"
 #include <thread> // TODO: remove with removing of JsEngine::webRequestLegacy
 
 using namespace AdblockPlus;
 
-void JsEngine::ScheduleWebRequest(const v8::Arguments& arguments)
+void JsEngine::ScheduleWebRequest(const v8::FunctionCallbackInfo<v8::Value>& arguments)
 {
   AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
   AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
   if (converted.size() != 3u)
     throw std::runtime_error("GET requires exactly 3 arguments");
 
   auto url = converted[0].AsString();
   if (!url.length())
     throw std::runtime_error("Invalid string passed as first argument to GET");
 
@@ skipping 34 matching lines @@
     auto headersObject = jsEngine->NewObject();
     for (const auto& header : response.responseHeaders)
     {
       headersObject.SetProperty(header.first, header.second);
     }
     resultObject.SetProperty("responseHeaders", headersObject);
 
     webRequestParams[2].Call(resultObject);
   };
 
-
   if (jsEngine->webRequestLegacy)
   {
     std::thread([jsEngine, url, headers, getCallback]
     {
       getCallback(jsEngine->webRequestLegacy->GET(url, headers));
     }).detach();
     return;
   }
 
   jsEngine->webRequest->GET(url, headers, getCallback);
 }
 
 namespace
 {
-  v8::Handle<v8::Value> GETCallback(const v8::Arguments& arguments)
+  void GETCallback(const v8::FunctionCallbackInfo<v8::Value>& arguments)
   {
     try
     {
       AdblockPlus::JsEngine::ScheduleWebRequest(arguments);
     } catch (const std::exception& e)
     {
-      using AdblockPlus::Utils::ToV8String;
-      v8::Isolate* isolate = arguments.GetIsolate();
-      return v8::ThrowException(ToV8String(isolate, e.what()));
+      return AdblockPlus::Utils::ThrowExceptionInJS(arguments.GetIsolate(), e.what());
     }
-
-    return v8::Undefined();
   }
 }
 
 AdblockPlus::JsValue& AdblockPlus::WebRequestJsObject::Setup(
     AdblockPlus::JsEngine& jsEngine, AdblockPlus::JsValue& obj)
 {
   obj.SetProperty("GET", jsEngine.NewCallback(::GETCallback));
   return obj;
 }