Issue 5034 - Part 4: JsEngine::Evaluate() return a JsValue

include/AdblockPlus/JsValue.h

 /*
  * 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 22 matching lines @@
 }
 
 namespace AdblockPlus
 {
   class JsValue;
   class JsEngine;
 
   typedef std::shared_ptr<JsEngine> JsEnginePtr;
 
   /**
-   * Shared smart pointer to a `JsValue` instance.
-   */
-  typedef std::shared_ptr<JsValue> JsValuePtr;

[sergei, 2017/04/19 19:11:15]

This is an achievement!

-
-  /**
    * List of JavaScript values.
    */
   typedef std::vector<AdblockPlus::JsValue> JsValueList;
 
   /**
    * Wrapper for JavaScript values.
    * See `JsEngine` for creating `JsValue` objects.
    */
   class JsValue
   {
@@ skipping 57 matching lines @@
      * (see `IsArray()`).
      * Technically, this is the name of the function that was used as a
      * constructor.
      * @return Class name of the value.
      */
     std::string GetClass() const;
 
     /**
      * Invokes the value as a function (see `IsFunction()`).
      * @param params Optional list of parameters.
-     * @param thisPtr Optional `this` value.
      * @return Value returned by the function.
      */
-    JsValue Call(const JsValueList& params = JsValueList(),
-        const AdblockPlus::JsValuePtr& thisPtr = AdblockPlus::JsValuePtr()) const;
+    JsValue Call(const JsValueList& params = JsValueList()) const;
+
+    /**
+     * Invokes the value as a method (see `IsFunction()`).
+     * @param params list of parameters.
+     * @param thisPtr `this` value.
+     * @return Value returned by the function.
+     */
+    JsValue Call(const JsValueList& params, const AdblockPlus::JsValue& thisValue) const;
 
     /**
      * Invokes the value as a function (see `IsFunction()`) with single
      * parameter.
      * @param arg A single required parameter.
      * @return Value returned by the function.
      */
     JsValue Call(const JsValue& arg) const;
 
     v8::Local<v8::Value> UnwrapValue() const;
 
   protected:
     JsEnginePtr jsEngine;
   private:
     JsValue(JsEnginePtr jsEngine, v8::Handle<v8::Value> value);
     void SetProperty(const std::string& name, v8::Handle<v8::Value> val);
     // Parameter args is not const because a pointer to its internal arrays is
     // passed to v8::Function::Call but the latter does not expect a const pointer.
     JsValue Call(std::vector<v8::Handle<v8::Value>>& args, v8::Local<v8::Object> thisObj) const;
 
     std::unique_ptr<v8::Persistent<v8::Value>> value;
   };
 }
 
 #endif