Issue 1547 - Pass isolate to v8::API

src/JsEngine.cpp

 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 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.
  *
@@ skipping 22 matching lines @@
     }
     else
       return v8::Script::Compile(v8Source);
   }
 
   void CheckTryCatch(const v8::TryCatch& tryCatch)
   {
     if (tryCatch.HasCaught())
       throw AdblockPlus::JsError(tryCatch.Exception(), tryCatch.Message());
   }
+
+  class V8Initializer
+  {
+    V8Initializer()
+    {
+      v8::V8::Initialize();
+    }
+
+    ~V8Initializer()
+    {
+      v8::V8::Dispose();
+    }
+  public:
+    static void Init()
+    {
+      // it's threadsafe since C++11 and it will be instantiated only once and
+      // destroyed at the application exit
+      static V8Initializer initializer;
+    }
+  };
 }
 
 AdblockPlus::JsEngine::JsEngine()
   : isolate(v8::Isolate::GetCurrent())
 {
 }
 
 AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::New(const AppInfo& appInfo)
 {
+  V8Initializer::Init();
   JsEnginePtr result(new JsEngine());
 
   const v8::Locker locker(result->isolate);
   const v8::HandleScope handleScope;
 
   result->context.reset(result->isolate, v8::Context::New(result->isolate));
   v8::Local<v8::Object> globalContext = v8::Local<v8::Context>::New(
     result->isolate, result->context)->Global();
   AdblockPlus::GlobalJsObject::Setup(result, appInfo,
     JsValuePtr(new JsValue(result, globalContext)));
@@ skipping 134 matching lines @@
   return logSystem;
 }
 
 void AdblockPlus::JsEngine::SetLogSystem(AdblockPlus::LogSystemPtr val)
 {
   if (!val)
     throw std::runtime_error("LogSystem cannot be null");
 
   logSystem = val;
 }