Issue 1550 - Get rid of V8ValueHolder.h

include/AdblockPlus/JsEngine.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2016 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/>.
  */
 
 #ifndef ADBLOCK_PLUS_JS_ENGINE_H
 #define ADBLOCK_PLUS_JS_ENGINE_H
 
+#include <functional>
 #include <map>
 #include <stdexcept>
 #include <stdint.h>
 #include <string>
 #include <AdblockPlus/AppInfo.h>
-#include <AdblockPlus/tr1_functional.h>
 #include <AdblockPlus/LogSystem.h>
 #include <AdblockPlus/FileSystem.h>
 #include <AdblockPlus/JsValue.h>
 #include <AdblockPlus/WebRequest.h>
-
-#include "tr1_memory.h"
 
 namespace v8
 {
   class Arguments;
   class Isolate;
   class Value;
   class Context;
   template<class T> class Handle;
   typedef Handle<Value>(*InvocationCallback)(const Arguments &args);
 }
 
 namespace AdblockPlus
 {
   class JsEngine;
 
   /**
    * Shared smart pointer to a `JsEngine` instance.
    */
-  typedef std::tr1::shared_ptr<JsEngine> JsEnginePtr;
-
-  /**
-   * Scope based isolate manager. Creates a new isolate instance on
-   * constructing and disposes it on destructing.
-   */
-  class ScopedV8Isolate
-  {
-  public:
-    ScopedV8Isolate();
-    ~ScopedV8Isolate();
-  protected:
-    v8::Isolate* isolate;
-  };
+  typedef std::shared_ptr<JsEngine> JsEnginePtr;
 
   /**
    * JavaScript engine used by `FilterEngine`, wraps v8.
-   *
-   * It's inherited from ScopedV8Isolate to have isolate disposed only after
-   * disposing of all objects which are using it.
    */
-  class JsEngine : public std::tr1::enable_shared_from_this<JsEngine>, protected ScopedV8Isolate
+  class JsEngine : public std::enable_shared_from_this<JsEngine>
   {
     friend class JsValue;
     friend class JsContext;
+
   public:
     /**
      * Event callback function.
      */
-    typedef std::tr1::function<void(JsValueList& params)> EventCallback;
+    typedef std::function<void(JsValueList& params)> EventCallback;
 
     /**
      * Maps events to callback functions.
      */
     typedef std::map<std::string, EventCallback> EventMap;
 
     /**
      * Creates a new JavaScript engine instance.
      * @param appInfo Information about the app.
      * @return New `JsEngine` instance.
@@ skipping 127 matching lines @@
 
     /**
      * Sets the `LogSystem` implementation used for logging (e.g. to handle
      * `console.log()` calls from JavaScript).
      * Setting this is optional, the engine will use a `DefaultLogSystem`
      * instance by default, which might be sufficient.
      * @param The `LogSystem` instance to use.
      */
     void SetLogSystem(LogSystemPtr val);
 
+    /**
+     * Sets a global property that can be accessed by all the scripts.
+     * @param name Name of the property to set.
+     * @param value Value of the property to set.
+     */
+    void SetGlobalProperty(const std::string& name, AdblockPlus::JsValuePtr value);
+
   private:
     JsEngine();
+
     FileSystemPtr fileSystem;
     WebRequestPtr webRequest;
     LogSystemPtr logSystem;
+    v8::Isolate* isolate;
     std::unique_ptr<v8::Persistent<v8::Context>> context;
     EventMap eventCallbacks;
+    JsValuePtr globalJsObject;
   };
 }
 
 #endif