Issue 1550 - Get rid of V8ValueHolder.h

src/JsValue.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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"
 
 AdblockPlus::JsValue::JsValue(AdblockPlus::JsEnginePtr jsEngine,
       v8::Handle<v8::Value> value)
     : jsEngine(jsEngine),
-      value(jsEngine->isolate, value)
+      value(new v8::Persistent<v8::Value>(jsEngine->isolate, value))
 {
 }
 
-AdblockPlus::JsValue::JsValue(AdblockPlus::JsValuePtr value)
-    : jsEngine(value->jsEngine),
-      value(value->value)
+AdblockPlus::JsValue::JsValue(AdblockPlus::JsValue&& src)
+    : jsEngine(src.jsEngine),
+      value(std::move(src.value))
 {
 }
 
 AdblockPlus::JsValue::~JsValue()
 {
+  if (value)
+  {
+    value->Dispose();
+    value.reset();
+  }
 }
 
 bool AdblockPlus::JsValue::IsUndefined() const
 {
   const JsContext context(jsEngine);
   return UnwrapValue()->IsUndefined();
 }
 
 bool AdblockPlus::JsValue::IsNull() const
 {
@@ skipping 106 matching lines @@
   if (!IsObject())
     throw new std::runtime_error("Attempting to set property on a non-object");
 
   v8::Local<v8::String> property = Utils::ToV8String(jsEngine->isolate, name);
   v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue());
   obj->Set(property, val);
 }
 
 v8::Local<v8::Value> AdblockPlus::JsValue::UnwrapValue() const
 {
-  return v8::Local<v8::Value>::New(jsEngine->isolate, value);
+  return v8::Local<v8::Value>::New(jsEngine->isolate, *value);
 }
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, const std::string& val)
 {
   const JsContext context(jsEngine);
   SetProperty(name, Utils::ToV8String(jsEngine->isolate, val));
 }
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, int64_t val)
 {
@@ skipping 24 matching lines @@
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsValueList& params, JsValuePtr thisPtr) const
 {
   if (!IsFunction())
     throw new std::runtime_error("Attempting to call a non-function");
 
   const JsContext context(jsEngine);
   if (!thisPtr)
   {
-    v8::Local<v8::Context> localContext = v8::Local<v8::Context>::New(jsEngine->isolate, jsEngine->context);
+    v8::Local<v8::Context> localContext = v8::Local<v8::Context>::New(
+      jsEngine->isolate, *jsEngine->context);
     thisPtr = JsValuePtr(new JsValue(jsEngine, localContext->Global()));
   }
   if (!thisPtr->IsObject())
     throw new std::runtime_error("`this` pointer has to be an object");
   v8::Local<v8::Object> thisObj = v8::Local<v8::Object>::Cast(thisPtr->UnwrapValue());
 
   std::vector<v8::Handle<v8::Value>> argv;
   for (JsValueList::const_iterator it = params.begin(); it != params.end(); ++it)
     argv.push_back((*it)->UnwrapValue());
 
   const v8::TryCatch tryCatch;
   v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue());
   v8::Local<v8::Value> result = func->Call(thisObj, argv.size(),
       argv.size() ? &argv.front() : 0);
 
   if (tryCatch.HasCaught())
     throw JsError(tryCatch.Exception(), tryCatch.Message());
 
   return JsValuePtr(new JsValue(jsEngine, result));
 }