Issue 1280 - Update v8, the second part

src/WebRequestJsObject.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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/JsValue.h>
 #include <AdblockPlus/WebRequest.h>
 
 #include "JsContext.h"
 #include "Thread.h"
 #include "WebRequestJsObject.h"
+#include "Utils.h"
 
 namespace
 {
   class WebRequestThread : public AdblockPlus::Thread
   {
   public:
     WebRequestThread(AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValueList& arguments)
         : jsEngine(jsEngine), url(arguments[0]->AsString())
     {
       if (!url.length())
@@ skipping 17 matching lines @@
 
       callback = arguments[2];
       if (!callback->IsFunction())
         throw std::runtime_error("Third argument to GET must be a function");
     }
 
     void Run()
     {
       AdblockPlus::ServerResponse result = jsEngine->GetWebRequest()->GET(url, headers);
 
-      AdblockPlus::JsContext context(jsEngine);
+      AdblockPlus::JsContext context{*jsEngine};
 
       AdblockPlus::JsValuePtr resultObject = jsEngine->NewObject();
       resultObject->SetProperty("status", result.status);
       resultObject->SetProperty("responseStatus", result.responseStatus);
       resultObject->SetProperty("responseText", result.responseText);
 
       AdblockPlus::JsValuePtr headersObject = jsEngine->NewObject();
       for (AdblockPlus::HeaderList::iterator it = result.responseHeaders.begin();
         it != result.responseHeaders.end(); ++it)
       {
         headersObject->SetProperty(it->first, it->second);
       }
       resultObject->SetProperty("responseHeaders", headersObject);
 
       AdblockPlus::JsValueList params;
       params.push_back(resultObject);
       callback->Call(params);
       delete this;
     }
 
   private:
     AdblockPlus::JsEnginePtr jsEngine;
     std::string url;
     AdblockPlus::HeaderList headers;
     AdblockPlus::JsValuePtr callback;
   };
 
-  v8::Handle<v8::Value> GETCallback(const v8::Arguments& arguments)
+  void GETCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
   {
-    WebRequestThread* thread;
+    auto isolate = info.GetIsolate();
     try
     {
-      AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
-      AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
+      AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(info);
+      AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(info);
       if (converted.size() != 3u)
         throw std::runtime_error("GET requires exactly 3 arguments");
-      thread = new WebRequestThread(jsEngine, converted);
+      WebRequestThread* thread = new WebRequestThread(jsEngine, converted);
+      thread->Start();
     }
     catch (const std::exception& e)
     {
-      return v8::ThrowException(v8::String::New(e.what()));
+      isolate->ThrowException(AdblockPlus::Utils::ToV8String(isolate, e.what()));
     }
-    thread->Start();
-    return v8::Undefined();
   }
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::WebRequestJsObject::Setup(
     AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValuePtr obj)
 {
   obj->SetProperty("GET", jsEngine->NewCallback(::GETCallback));
   return obj;
 }