Issue #3593 - Make isolate a fully internal member of the engine

include/AdblockPlus/JsEngine.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * 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
@@ skipping 32 matching lines @@
 namespace AdblockPlus
 {
   class JsEngine;
 
   /**
    * Shared smart pointer to a `JsEngine` instance.
    */
   typedef std::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();
-    v8::Isolate* Get()
-    {
-      return isolate;
-    }
-  private:
-    ScopedV8Isolate(const ScopedV8Isolate&);
-    ScopedV8Isolate& operator=(const ScopedV8Isolate&);
-
-    v8::Isolate* isolate;
-  };
-
-  /**
-   * Shared smart pointer to ScopedV8Isolate instance;
-   */
-  typedef std::shared_ptr<ScopedV8Isolate> ScopedV8IsolatePtr;
-
-  /**
    * JavaScript engine used by `FilterEngine`, wraps v8.
    */
   class JsEngine : public std::enable_shared_from_this<JsEngine>
   {
   public:
     /**
      * Event callback function.
      */
     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.
      * @param isolate v8::Isolate wrapper. This parameter should be considered
      *        as a temporary hack for tests, it will go away. Issue #3593.
      * @return New `JsEngine` instance.
      */
-    static JsEnginePtr New(const AppInfo& appInfo = AppInfo(), const ScopedV8IsolatePtr& isolate = ScopedV8IsolatePtr(new ScopedV8Isolate()));
+    static JsEnginePtr New(const AppInfo& appInfo = AppInfo());
 
     /**
      * Registers the callback function for an event.
      * @param eventName Event name. Note that this can be any string - it's a
      *        general purpose event handling mechanism.
      * @param callback Event callback function.
      */
     void SetEventCallback(const std::string& eventName, EventCallback callback);
 
     /**
@@ skipping 125 matching lines @@
     /**
      * 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);
 
     /**
      * Returns a pointer to associated v8::Isolate.
      */
-    v8::Isolate* GetIsolate()
+    v8::Isolate* GetIsolate() const
     {
-      return isolate->Get();
+      return isolate;
     }
 
+    /// Ordinary destructor
+    ~JsEngine();
+
   protected:
-    explicit JsEngine(const ScopedV8IsolatePtr& isolate);
+    /**
+     * Non-public constructor enforces factory use.
+     *
+     * @param isolate
+     *   v8 isolate obtained from its factory
+     */
+    explicit JsEngine(v8::Isolate* isolate);
 
     /**
      * Retrieve the global object as a JsValuePtr
      * 
      * \par Precondition
      * - Requires a v8 execution scope already present
      */
     JsValuePtr GetGlobalObject();
 
-    /// Isolate must be disposed only after disposing of all objects which are
-    /// using it.
-    ScopedV8IsolatePtr isolate;
+    /**
+     * Isolate member must be have life span that encompasses any other object
+     * that uses it. Thus it's declared first so that it is constructed first
+     * and destroyed last.
+     */
+    v8::Isolate* isolate;
 
     FileSystemPtr fileSystem;
     WebRequestPtr webRequest;
     LogSystemPtr logSystem;
     EventMap eventCallbacks;
   };
 }
 
 #endif