Issue 5034 - Part 3: Create plain JsValue instead of JsValuePtr

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
@@ skipping 19 matching lines @@
       value(new v8::Persistent<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));

[hub, 2017/04/19 17:57:22]

Here I wonder if we shouldn't change JsValue::value declaration to be a
shared_ptr<> instead of a unique_ptr<> and thus avoid creating
v8::Persistent<v8::Value>.

[sergei, 2017/04/19 18:56:52]

I would not like to change it to std::shared_ptr, at least so far.

[hub, 2017/04/19 21:56:49]

ok.

+}
+
 AdblockPlus::JsValue::~JsValue()
 {
   if (value)
   {
     value->Dispose();
     value.reset();
   }
 }
 
+JsValue& AdblockPlus::JsValue::operator=(const JsValue& src)
+{
+  if (value)
+    value->Dispose();

[sergei, 2017/04/19 18:56:52]

actually, the lock (JsContext) should be acquired before calling of Dispose. I'm
afraid there is a bug in the destructor because it's not acquiring the lock.

[hub, 2017/04/19 21:56:49]

ah ok. Will fix this and the destructor.

+  jsEngine = src.jsEngine;
+  const JsContext context(src.jsEngine);
+  value.reset(new v8::Persistent<v8::Value>(src.jsEngine->GetIsolate(), *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);
   return UnwrapValue()->IsNull();
@@ skipping 61 matching lines @@
   if (!IsArray())
     throw std::runtime_error("Cannot convert a non-array to list");
 
   const JsContext context(jsEngine);
   JsValueList result;
   v8::Local<v8::Array> array = v8::Local<v8::Array>::Cast(UnwrapValue());
   uint32_t length = array->Length();
   for (uint32_t i = 0; i < length; i++)
   {
     v8::Local<v8::Value> item = array->Get(i);
-    result.push_back(JsValuePtr(new JsValue(jsEngine, item)));
+    result.push_back(JsValue(jsEngine, item));
   }
   return result;
 }
 
 std::vector<std::string> AdblockPlus::JsValue::GetOwnPropertyNames() const
 {
   if (!IsObject())
     throw new std::runtime_error("Attempting to get propert list for a non-object");
 
   const JsContext context(jsEngine);
   v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(UnwrapValue());
-  JsValueList properties = JsValuePtr(new JsValue(jsEngine, object->GetOwnPropertyNames()))->AsList();
+  JsValueList properties = JsValue(jsEngine, object->GetOwnPropertyNames()).AsList();
   std::vector<std::string> result;
   for (const auto& property : properties)
-    result.push_back(property->AsString());
+    result.push_back(property.AsString());
   return result;
 }
 
 
 AdblockPlus::JsValue AdblockPlus::JsValue::GetProperty(const std::string& name) const
 {
   if (!IsObject())
     throw new std::runtime_error("Attempting to get property of a non-object");
 
   const JsContext context(jsEngine);
@@ skipping 10 matching lines @@
   v8::Local<v8::String> property = Utils::ToV8String(jsEngine->GetIsolate(), 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->GetIsolate(), *value);
 }
 
-JsValue AdblockPlus::JsValue::Clone() const
-{
-  return JsValue(jsEngine, UnwrapValue());
-}
-
 void AdblockPlus::JsValue::SetProperty(const std::string& name, const std::string& val)
 {
   const JsContext context(jsEngine);
   SetProperty(name, Utils::ToV8String(jsEngine->GetIsolate(), val));
 }
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, int64_t val)
 {
   const JsContext context(jsEngine);
   SetProperty(name, v8::Number::New(jsEngine->GetIsolate(), val));
@@ skipping 14 matching lines @@
 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());
 }
 
-JsValue JsValue::Call(const JsConstValueList& params, const JsValuePtr& thisPtr) const
+JsValue JsValue::Call(const JsValueList& params, const JsValuePtr& thisPtr) const
 {
   const JsContext context(jsEngine);
   v8::Local<v8::Object> thisObj = thisPtr ?
     v8::Local<v8::Object>::Cast(thisPtr->UnwrapValue()) :
     context.GetV8Context()->Global();
 
   std::vector<v8::Handle<v8::Value>> argv;
   for (const auto& param : params)
-    argv.push_back(param->UnwrapValue());
+    argv.push_back(param.UnwrapValue());
 
   return Call(argv, thisObj);
 }
 
 JsValue JsValue::Call(const JsValue& arg) const
 {
   const JsContext context(jsEngine);
 
   std::vector<v8::Handle<v8::Value>> argv;
   argv.push_back(arg.UnwrapValue());
@@ skipping 13 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);
 }