Issue 3589 - Change return type of AdblockPlus::JsValue::Call from pointer to r-value object.

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))
 {
 }
 
 AdblockPlus::JsValue::JsValue(AdblockPlus::JsValue&& src)
     : jsEngine(src.jsEngine),
       value(std::move(src.value))
@@ skipping 163 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());
 }
 
-AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsConstValueList& params, JsValuePtr thisPtr) const
+JsValue JsValue::Call(const JsConstValueList& 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->GetIsolate(), *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());
+  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());
 
+  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());
+
+  return Call(argv, context.GetV8Context()->Global());
+}
+
+JsValue JsValue::Call(std::vector<v8::Handle<v8::Value>>& args, v8::Local<v8::Object> thisObj) const
+{
+  if (!IsFunction())
+    throw new std::runtime_error("Attempting to call a non-function");
+  if (!thisObj->IsObject())
+    throw new std::runtime_error("`this` pointer has to be an object");
+
+  const JsContext context(jsEngine);
+
   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);
+  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 JsValuePtr(new JsValue(jsEngine, result));
+  return JsValue(jsEngine, result);
 }
-
-AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsConstValuePtr& arg) const
-{
-  JsConstValueList params;
-  params.push_back(arg);
-  return Call(params);
-}