Noissue - updated to libadblockplus revision dca8df9af1a7

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;
-  typedef std::shared_ptr<const JsValue> JsConstValuePtr;
-
-  /**
    * List of JavaScript values.
    */
-  typedef std::vector<AdblockPlus::JsValuePtr> JsValueList;
-  typedef std::vector<AdblockPlus::JsConstValuePtr> JsConstValueList;
+  typedef std::vector<AdblockPlus::JsValue> JsValueList;
 
   /**
    * Wrapper for JavaScript values.
    * See `JsEngine` for creating `JsValue` objects.
    */
   class JsValue
   {
     friend class JsEngine;
   public:
     JsValue(JsValue&& src);
+    JsValue(const JsValue& src);
     virtual ~JsValue();
 
+    JsValue& operator=(const JsValue& src);
+
     bool IsUndefined() const;
     bool IsNull() const;
     bool IsString() const;
     bool IsNumber() const;
     bool IsBool() const;
     bool IsObject() const;
     bool IsArray() const;
     bool IsFunction() const;
     std::string AsString() const;
     int64_t AsInt() const;
     bool AsBool() const;
     JsValueList AsList() const;
 
     /**
      * Returns a list of property names if this is an object (see `IsObject()`).
      * @return List of property names.
      */
     std::vector<std::string> GetOwnPropertyNames() const;
 
     /**
      * Returns a property value if this is an object (see `IsObject()`).
      * @param name Property name.
      * @return Property value, undefined (see `IsUndefined()`) if the property
      *         does not exist.
      */
-    JsValuePtr GetProperty(const std::string& name) const;
+    JsValue GetProperty(const std::string& name) const;
 
     //@{
     /**
      * Sets a property value if this is an object (see `IsObject()`).
      * @param name Property name.
      * @param val Property value.
      */
     void SetProperty(const std::string& name, const std::string& val);
     void SetProperty(const std::string& name, int64_t val);
     void SetProperty(const std::string& name, bool val);
-    void SetProperty(const std::string& name, const JsValuePtr& value);
+    void SetProperty(const std::string& name, const JsValue& value);
     inline void SetProperty(const std::string& name, const char* val)
     {
       SetProperty(name, std::string(val));
     }
     inline void SetProperty(const std::string& name, int val)
     {
       SetProperty(name, static_cast<int64_t>(val));
     }
     //@}
 
     /**
      * Returns the value's class name, e.g.\ _Array_ for arrays
      * (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 JsConstValueList& params = JsConstValueList(),
-        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