Issue 1280 - Update v8, the second part

include/AdblockPlus/JsEngine.h

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 12 matching lines @@
 #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"
-#include "V8ValueHolder.h"
 
 namespace v8
 {
   class Arguments;
   class Isolate;
   class Value;
   class Context;
   template<class T> class Handle;
   typedef Handle<Value>(*InvocationCallback)(const Arguments &args);
+  typedef void(*FunctionCallback)(const FunctionCallbackInfo<Value>& info);
 }
 
 namespace AdblockPlus
 {
   class JsEngine;
 
   /**
    * Shared smart pointer to a `JsEngine` instance.
    */
-  typedef std::tr1::shared_ptr<JsEngine> JsEnginePtr;
+  typedef std::shared_ptr<JsEngine> JsEnginePtr;
+
+  // These classes are inherited by JsEngine to avoid any mistake in the order of object destroying and
+  // disposing. The isolate should be disposed after the everything else. v8::Isolate::Scope
+  // requires a scope, there is no API to "close" it.
+  class IsolateManagerJsEngine
+  {
+  protected:
+    IsolateManagerJsEngine()
+      : isolate{v8::Isolate::New()}
+    {
+    }
+    ~IsolateManagerJsEngine()
+    {
+      isolate->Dispose();
+    }
+    v8::Isolate* isolate;
+  };
+
+  class IsolateScopeJsEngine : protected IsolateManagerJsEngine
+  {
+  protected:
+    IsolateScopeJsEngine()
+      : isolateScope{isolate}
+    {
+    }
+    ~IsolateScopeJsEngine()
+    {
+    }
+    v8::Isolate::Scope isolateScope;
+  };
+
+  class ContextScopeJsEngine : protected IsolateScopeJsEngine
+  {
+  protected:
+    ~ContextScopeJsEngine()
+    {
+    }
+    v8::UniquePersistent<v8::Context> context;
+  };
 
   /**
    * JavaScript engine used by `FilterEngine`, wraps v8.
    */
-  class JsEngine : public std::tr1::enable_shared_from_this<JsEngine>
+  class JsEngine : public std::enable_shared_from_this<JsEngine>, protected ContextScopeJsEngine
   {
     friend class JsValue;
     friend class JsContext;
+    struct PrivateCtrArg{};
+  public:
+    JsEngine(PrivateCtrArg);
+    ~JsEngine();
 
-  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 67 matching lines @@
      */
     JsValuePtr 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.
      */
-    JsValuePtr NewCallback(v8::InvocationCallback callback);
+    JsValuePtr NewCallback(v8::FunctionCallback callback);
 
     /**
      * Returns a `JsEngine` instance contained in a `v8::Arguments` object.
      * Use this in callbacks created via `NewCallback()` to retrieve the current
      * `JsEngine`.
      * @param arguments `v8::Arguments` object containing the `JsEngine`
      *        instance.
      * @return `JsEngine` instance from `v8::Arguments`.
      */
-    static JsEnginePtr FromArguments(const v8::Arguments& arguments);
+    static JsEnginePtr FromArguments(const v8::FunctionCallbackInfo<v8::Value>& arguments);
 
     /**
      * Converts v8 arguments to `JsValue` objects.
      * @param arguments `v8::Arguments` object containing the arguments to
      *        convert.
      * @return List of arguments converted to `JsValue` objects.
      */
-    JsValueList ConvertArguments(const v8::Arguments& arguments);
+    JsValueList ConvertArguments(const v8::FunctionCallbackInfo<v8::Value>& arguments);
 
     /**
      * @see `SetFileSystem()`.
      */
     FileSystemPtr GetFileSystem();
 
     /**
      * 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 22 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);
 
   private:
-    JsEngine();
-
     FileSystemPtr fileSystem;
     WebRequestPtr webRequest;
     LogSystemPtr logSystem;
-    v8::Isolate* isolate;
-    V8ValueHolder<v8::Context> context;
     EventMap eventCallbacks;
   };
 }
 
 #endif