Issue 1197 - change local copy of v8 (to 4.3.15) to work with Visual Studio 2013

src/JsEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 <libplatform/libplatform.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())
     {
       const v8::Handle<v8::String> v8Filename = ToV8String(isolate, filename);
       return v8::Script::Compile(v8Source, v8Filename);
     }
     else
       return v8::Script::Compile(v8Source);
   }
 
   void CheckTryCatch(const v8::TryCatch& tryCatch)
   {
     if (tryCatch.HasCaught())
       throw AdblockPlus::JsError(tryCatch.Exception(), tryCatch.Message());
   }
 
   class V8Initializer
   {
     V8Initializer()
+      : platform(v8::platform::CreateDefaultPlatform())
     {
+      v8::V8::InitializePlatform(platform);
       v8::V8::Initialize();
     }
 
     ~V8Initializer()
     {
       v8::V8::Dispose();
+      v8::V8::ShutdownPlatform();
+      delete platform;
     }
+    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;
     }
   };
 }
 
@@ skipping 14 matching lines @@
 
 AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::New(const AppInfo& appInfo)
 {
   V8Initializer::Init();
   JsEnginePtr result(new JsEngine());
 
   const v8::Locker locker(result->isolate);
   const v8::Isolate::Scope isolateScope(result->isolate);
   const v8::HandleScope handleScope(result->isolate);
 
-  result->context.reset(new v8::Persistent<v8::Context>(result->isolate,
+  result->context.reset(new v8::UniquePersistent<v8::Context>(result->isolate,
     v8::Context::New(result->isolate)));
   v8::Local<v8::Object> globalContext = v8::Local<v8::Context>::New(
     result->isolate, *result->context)->Global();
   AdblockPlus::GlobalJsObject::Setup(result, appInfo,
     JsValuePtr(new JsValue(result, globalContext)));
   return result;
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::Evaluate(const std::string& source,
     const std::string& filename)
@@ skipping 21 matching lines @@
 
 void AdblockPlus::JsEngine::TriggerEvent(const std::string& eventName, AdblockPlus::JsValueList& params)
 {
   EventMap::iterator it = eventCallbacks.find(eventName);
   if (it != eventCallbacks.end())
     it->second(params);
 }
 
 void AdblockPlus::JsEngine::Gc()
 {
-  while (!v8::V8::IdleNotification());
+  while (!isolate->IdleNotification(1000));
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(const std::string& val)
 {
   const JsContext context(shared_from_this());
   return JsValuePtr(new JsValue(shared_from_this(),
     Utils::ToV8String(isolate, val)));
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(int64_t val)
 {
   const JsContext context(shared_from_this());
   return JsValuePtr(new JsValue(shared_from_this(),
     v8::Number::New(isolate, val)));
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(bool val)
 {
   const JsContext context(shared_from_this());
-  return JsValuePtr(new JsValue(shared_from_this(), v8::Boolean::New(val)));
+  return JsValuePtr(new JsValue(shared_from_this(), v8::Boolean::New(isolate, val)));
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewObject()
 {
   const JsContext context(shared_from_this());
-  return JsValuePtr(new JsValue(shared_from_this(), v8::Object::New()));
+  return JsValuePtr(new JsValue(shared_from_this(), v8::Object::New(isolate)));
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewCallback(
-    v8::InvocationCallback callback)
+    v8::FunctionCallback callback)
 {
   const JsContext context(shared_from_this());
 
   // Note: we are leaking this weak pointer, no obvious way to destroy it when
   // it's no longer used
   std::tr1::weak_ptr<JsEngine>* data =
       new std::tr1::weak_ptr<JsEngine>(shared_from_this());
-  v8::Local<v8::FunctionTemplate> templ = v8::FunctionTemplate::New(callback,
-      v8::External::New(data));
+  v8::Local<v8::FunctionTemplate> templ = v8::FunctionTemplate::New(isolate, callback,
+      v8::External::New(isolate, data));
   return JsValuePtr(new JsValue(shared_from_this(), templ->GetFunction()));
 }
 
-AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::FromArguments(const v8::Arguments& arguments)
+AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::FromArguments(const v8::FunctionCallbackInfo<v8::Value>& arguments)
 {
   const v8::Local<const v8::External> external =
       v8::Local<const v8::External>::Cast(arguments.Data());
   std::tr1::weak_ptr<JsEngine>* data =
       static_cast<std::tr1::weak_ptr<JsEngine>*>(external->Value());
   JsEnginePtr result = data->lock();
   if (!result)
     throw std::runtime_error("Oops, our JsEngine is gone, how did that happen?");
   return result;
 }
 
-AdblockPlus::JsValueList AdblockPlus::JsEngine::ConvertArguments(const v8::Arguments& arguments)
+AdblockPlus::JsValueList AdblockPlus::JsEngine::ConvertArguments(const v8::FunctionCallbackInfo<v8::Value>& arguments)
 {
   const JsContext context(shared_from_this());
   JsValueList list;
   for (int i = 0; i < arguments.Length(); i++)
     list.push_back(JsValuePtr(new JsValue(shared_from_this(), arguments[i])));
   return list;
 }
 
 AdblockPlus::FileSystemPtr AdblockPlus::JsEngine::GetFileSystem()
 {
@@ skipping 32 matching lines @@
   return logSystem;
 }
 
 void AdblockPlus::JsEngine::SetLogSystem(AdblockPlus::LogSystemPtr val)
 {
   if (!val)
     throw std::runtime_error("LogSystem cannot be null");
 
   logSystem = val;
 }