Issue 1280 - Update v8

src/JsEngine.cpp

 /*
  * 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 37 matching lines @@
 {
 }
 
 AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::New(const AppInfo& appInfo)
 {
   JsEnginePtr result(new JsEngine());
 
   const v8::Locker locker(result->isolate);
   const v8::HandleScope handleScope;
 
-  result->context.reset(result->isolate, v8::Context::New());
+  result->context.reset(result->isolate, v8::Context::New(result->isolate));
   AdblockPlus::GlobalJsObject::Setup(result, appInfo,
-      JsValuePtr(new JsValue(result, result->context->Global())));
+      JsValuePtr(new JsValue(result, v8::Local<v8::Context>::New(result->isolate, result->context)->Global())));

[Wladimir Palant, 2014/11/01 22:30:25]

Why do you need to create a new handle for the context? The isolate is
guaranteed to be the same (see two lines above), why not access the global
object via the original handle?

Nit: the line break is there to keep the lines within 80 characters. Your
additions make this line too long again, meaning that you need to add a line
break somewhere. Or even better: create a temporary variable for your context
clone.

[sergei, 2014/11/03 12:58:19]

Not sure that I correctly understand what you mean. Could you write a line of
expected code? If you mean something like `result->context->Global()` then it's
not impossible with the new version of v8. The API of v8::Persistent has changed
with the updating of v8. There is only one way to obtain a handle from
persistent, which is to create the handle passing persistent into handle
constructor.
fixed

[Felix Dahlke, 2014/11/03 15:46:24]

I see. Looked through the docs a bit, unfortunately I don't have the time to dig
into this more right now, so I've got to ask: How I see it, v8::Persistent still
inherits operator->() from v8::Handle - why can't we use it for calling Global()
anymore? What was the API change?

[Wladimir Palant, 2014/11/03 18:06:33]

I see, so v8::Persistent cannot be used as a handle any more. Then this change
is fine of course.

   return result;
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::Evaluate(const std::string& source,
     const std::string& filename)
 {
   const JsContext context(shared_from_this());
   const v8::TryCatch tryCatch;
   const v8::Handle<v8::Script> script = CompileScript(source, filename);
   CheckTryCatch(tryCatch);
@@ skipping 122 matching lines @@
   return logSystem;
 }
 
 void AdblockPlus::JsEngine::SetLogSystem(AdblockPlus::LogSystemPtr val)
 {
   if (!val)
     throw std::runtime_error("LogSystem cannot be null");
 
   logSystem = val;
 }