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

src/JsEngine.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 98 matching lines @@
   {
     if (auto jsEngine = weakJsEngine.lock())
       jsEngine->CallTimerTask(timerTaskIterator);
   });
 }
 
 void JsEngine::CallTimerTask(const TimerTasks::const_iterator& timerTaskIterator)
 {
   const JsContext context(shared_from_this());
   JsValue callback(shared_from_this(), v8::Local<v8::Value>::New(GetIsolate(), *timerTaskIterator->arguments[0]));
-  JsConstValueList callbackArgs;
+  JsValueList callbackArgs;
   for (int i = 2; i < timerTaskIterator->arguments.size(); i++)
-    callbackArgs.emplace_back(new JsValue(shared_from_this(),
-    v8::Local<v8::Value>::New(GetIsolate(), *timerTaskIterator->arguments[i])));
+    callbackArgs.emplace_back(JsValue(shared_from_this(),
+      v8::Local<v8::Value>::New(GetIsolate(), *timerTaskIterator->arguments[i])));
   callback.Call(callbackArgs);
   timerTasks.erase(timerTaskIterator);
 }
 
 AdblockPlus::JsEngine::JsEngine(const ScopedV8IsolatePtr& isolate, TimerPtr timer)
   : isolate(isolate)
   , fileSystem(new DefaultFileSystem())
   , webRequest(new DefaultWebRequest())
   , logSystem(new DefaultLogSystem())
   , timer(std::move(timer))
@@ skipping 47 matching lines @@
   std::lock_guard<std::mutex> lock(eventCallbacksMutex);
   eventCallbacks[eventName] = callback;
 }
 
 void AdblockPlus::JsEngine::RemoveEventCallback(const std::string& eventName)
 {
   std::lock_guard<std::mutex> lock(eventCallbacksMutex);
   eventCallbacks.erase(eventName);
 }
 
-void AdblockPlus::JsEngine::TriggerEvent(const std::string& eventName, const AdblockPlus::JsConstValueList& params)
+void AdblockPlus::JsEngine::TriggerEvent(const std::string& eventName, const AdblockPlus::JsValueList& params)
 {
   EventCallback callback;
   {
     std::lock_guard<std::mutex> lock(eventCallbacksMutex);
     auto it = eventCallbacks.find(eventName);
     if (it == eventCallbacks.end())
       return;
     callback = it->second;
   }
   callback(params);
 }
 
 void AdblockPlus::JsEngine::Gc()
 {
   while (!v8::V8::IdleNotification());
 }
 
-AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(const std::string& val)
+AdblockPlus::JsValue AdblockPlus::JsEngine::NewValue(const std::string& val)
 {
   const JsContext context(shared_from_this());
-  return JsValuePtr(new JsValue(shared_from_this(),
-    Utils::ToV8String(GetIsolate(), val)));
+  return JsValue(shared_from_this(), Utils::ToV8String(GetIsolate(), val));
 }
 
-AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(int64_t val)
+AdblockPlus::JsValue AdblockPlus::JsEngine::NewValue(int64_t val)
 {
   const JsContext context(shared_from_this());
-  return JsValuePtr(new JsValue(shared_from_this(),
-    v8::Number::New(GetIsolate(), val)));
+  return JsValue(shared_from_this(), v8::Number::New(GetIsolate(), val));
 }
 
-AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(bool val)
+AdblockPlus::JsValue AdblockPlus::JsEngine::NewValue(bool val)
 {
   const JsContext context(shared_from_this());
-  return JsValuePtr(new JsValue(shared_from_this(), v8::Boolean::New(val)));
+  return JsValue(shared_from_this(), v8::Boolean::New(val));
 }
 
-AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewObject()
+AdblockPlus::JsValue AdblockPlus::JsEngine::NewObject()
 {
   const JsContext context(shared_from_this());
-  return JsValuePtr(new JsValue(shared_from_this(), v8::Object::New()));
+  return JsValue(shared_from_this(), v8::Object::New());
 }
 
 AdblockPlus::JsValue AdblockPlus::JsEngine::NewCallback(
     const v8::InvocationCallback& 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::weak_ptr<JsEngine>* data =
       new std::weak_ptr<JsEngine>(shared_from_this());
   v8::Local<v8::FunctionTemplate> templ = v8::FunctionTemplate::New(callback,
       v8::External::New(data));
   return JsValue(shared_from_this(), templ->GetFunction());
 }
 
 AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::FromArguments(const v8::Arguments& arguments)
 {
   const v8::Local<const v8::External> external =
       v8::Local<const v8::External>::Cast(arguments.Data());
   std::weak_ptr<JsEngine>* data =
       static_cast<std::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::JsConstValueList AdblockPlus::JsEngine::ConvertArguments(const v8::Arguments& arguments)
+AdblockPlus::JsValueList AdblockPlus::JsEngine::ConvertArguments(const v8::Arguments& arguments)
 {
   const JsContext context(shared_from_this());
-  JsConstValueList list;
+  JsValueList list;
   for (int i = 0; i < arguments.Length(); i++)
-    list.push_back(JsValuePtr(new JsValue(shared_from_this(), arguments[i])));
+    list.push_back(JsValue(shared_from_this(), arguments[i]));
   return list;
 }
 
 AdblockPlus::FileSystemPtr AdblockPlus::JsEngine::GetFileSystem() const
 {
   return fileSystem;
 }
 
 void AdblockPlus::JsEngine::SetFileSystem(const AdblockPlus::FileSystemPtr& val)
 {
@@ skipping 49 matching lines @@
   logSystem = val;
 }
 
 
 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name,
                                               const AdblockPlus::JsValue& value)
 {
   auto global = GetGlobalObject();
   global.SetProperty(name, value);
 }