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

include/AdblockPlus/JsEngine.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 75 matching lines @@
    */
   class JsEngine : public std::enable_shared_from_this<JsEngine>
   {
     friend class JsValue;
     friend class JsContext;
 
   public:
     /**
      * Event callback function.
      */
-    typedef std::function<void(const JsConstValueList& params)> EventCallback;
+    typedef std::function<void(const JsValueList& params)> EventCallback;
 
     /**
     * Callback function returning false when current connection is not allowed
     * e.g. because it is a metered connection.
     */
     typedef std::function<bool()> IsConnectionAllowedCallback;
 
     /**
      * Maps events to callback functions.
      */
@@ skipping 23 matching lines @@
      * Removes the callback function for an event.
      * @param eventName Event name.
      */
     void RemoveEventCallback(const std::string& eventName);
 
     /**
      * Triggers an event.
      * @param eventName Event name.
      * @param params Event parameters.
      */
-    void TriggerEvent(const std::string& eventName, const JsConstValueList& params);
+    void TriggerEvent(const std::string& eventName, const JsValueList& params);
 
     /**
      * Evaluates a JavaScript expression.
      * @param source JavaScript expression to evaluate.
      * @param filename Optional file name for the expression, used in error
      *        messages.
      * @return Result of the evaluated expression.
      */
     JsValuePtr Evaluate(const std::string& source,
         const std::string& filename = "");
 
     /**
      * Initiates a garbage collection.
      */
     void Gc();
 
     //@{
     /**
      * Creates a new JavaScript value.
      * @param val Value to convert.
      * @return New `JsValue` instance.
      */
-    JsValuePtr NewValue(const std::string& val);
-    JsValuePtr NewValue(int64_t val);
-    JsValuePtr NewValue(bool val);
-    inline JsValuePtr NewValue(const char* val)
+    JsValue NewValue(const std::string& val);
+    JsValue NewValue(int64_t val);
+    JsValue NewValue(bool val);
+    inline JsValue NewValue(const char* val)
     {
       return NewValue(std::string(val));
     }
-    inline JsValuePtr NewValue(int val)
+    inline JsValue NewValue(int val)
     {
       return NewValue(static_cast<int64_t>(val));
     }
 #ifdef __APPLE__
-    inline JsValuePtr NewValue(long val)
+    inline JsValue NewValue(long val)
     {
       return NewValue(static_cast<int64_t>(val));
     }
 #endif
     //@}
 
     /**
      * Creates a new JavaScript object.
      * @return New `JsValue` instance.
      */
-    JsValuePtr NewObject();
+    JsValue NewObject();
 
     /**
      * Creates a JavaScript function that invokes a C++ callback.
      * @param callback C++ callback to invoke. The callback receives a
      *        `v8::Arguments` object and can use `FromArguments()` to retrieve
      *        the current `JsEngine`.
      * @return New `JsValue` instance.
      */
     JsValue NewCallback(const v8::InvocationCallback& callback);
 
@@ skipping 13 matching lines @@
      * callback associated for global setTimeout method.
      */
     static void ScheduleTimer(const v8::Arguments& arguments);
 
     /**
      * Converts v8 arguments to `JsValue` objects.
      * @param arguments `v8::Arguments` object containing the arguments to
      *        convert.
      * @return List of arguments converted to `const JsValue` objects.
      */
-    JsConstValueList ConvertArguments(const v8::Arguments& arguments);
+    JsValueList ConvertArguments(const v8::Arguments& arguments);
 
     /**
      * @see `SetFileSystem()`.
      */
     FileSystemPtr GetFileSystem() const;
 
     /**
      * Sets the `FileSystem` implementation used for all file I/O.
      * Setting this is optional, the engine will use a `DefaultFileSystem`
      * instance by default, which might be sufficient.
@@ skipping 80 matching lines @@
     EventMap eventCallbacks;
     std::mutex eventCallbacksMutex;
     mutable std::mutex isConnectionAllowedMutex;
     IsConnectionAllowedCallback isConnectionAllowed;
     TimerTasks timerTasks;
     TimerPtr timer;
   };
 }
 
 #endif