Issue 4907 - Update v8 to 5.7.278 in libadblockplus

src/JsValue.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 <vector>
 #include <AdblockPlus.h>
 
 #include "JsContext.h"
 #include "JsError.h"
 #include "Utils.h"
 
 using namespace AdblockPlus;
 
 AdblockPlus::JsValue::JsValue(AdblockPlus::JsEnginePtr jsEngine,
       v8::Handle<v8::Value> value)
     : jsEngine(jsEngine),
-      value(new v8::Persistent<v8::Value>(jsEngine->GetIsolate(), value))
+      value(new v8::Global<v8::Value>(jsEngine->GetIsolate(), value))
 {
 }
 
 AdblockPlus::JsValue::JsValue(AdblockPlus::JsValue&& src)
     : jsEngine(src.jsEngine),
       value(std::move(src.value))
 {
 }
 
 AdblockPlus::JsValue::JsValue(const JsValue& src)
   : jsEngine(src.jsEngine)
 {
   const JsContext context(*src.jsEngine);
-  value.reset(new v8::Persistent<v8::Value>(src.jsEngine->GetIsolate(), *src.value));
+  value.reset(new v8::Global<v8::Value>(src.jsEngine->GetIsolate(), *src.value));
 }
 
 AdblockPlus::JsValue::~JsValue()
 {
   if (value)
   {
     const JsContext context(*jsEngine);
-    value->Dispose();
     value.reset();
   }
 }
 
 JsValue& AdblockPlus::JsValue::operator=(const JsValue& src)
 {
   const JsContext context(*src.jsEngine);
-  if (value)
-    value->Dispose();
   jsEngine = src.jsEngine;
-  value.reset(new v8::Persistent<v8::Value>(src.jsEngine->GetIsolate(), *src.value));
+  value.reset(new v8::Global<v8::Value>(src.jsEngine->GetIsolate(), *src.value));
 
   return *this;
 }
+
+JsValue& AdblockPlus::JsValue::operator=(JsValue&& src)
+{
+  jsEngine = std::move(src.jsEngine);
+  value = std::move(src.value);
+
+  return *this;
+}
 
 bool AdblockPlus::JsValue::IsUndefined() const
 {
   const JsContext context(*jsEngine);
   return UnwrapValue()->IsUndefined();
 }
 
 bool AdblockPlus::JsValue::IsNull() const
 {
   const JsContext context(*jsEngine);
@@ skipping 129 matching lines @@
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, const JsValue& val)
 {
   const JsContext context(*jsEngine);
   SetProperty(name, val.UnwrapValue());
 }
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, bool val)
 {
   const JsContext context(*jsEngine);
-  SetProperty(name, v8::Boolean::New(val));
+  SetProperty(name, v8::Boolean::New(jsEngine->GetIsolate(), val));
 }
 
 std::string AdblockPlus::JsValue::GetClass() const
 {
   if (!IsObject())
     throw new std::runtime_error("Cannot get constructor of a non-object");
 
   const JsContext context(*jsEngine);
   v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue());
   return Utils::FromV8String(obj->GetConstructorName());
@@ skipping 43 matching lines @@
   const v8::TryCatch tryCatch;
   v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue());
   v8::Local<v8::Value> result = func->Call(thisObj, args.size(),
     args.size() ? &args[0] : nullptr);
 
   if (tryCatch.HasCaught())
     throw JsError(tryCatch.Exception(), tryCatch.Message());
 
   return JsValue(jsEngine, result);
 }