Issue 6526 - replace deprecated v8::Handle by v8::Local

src/JsEngine.cpp

@@ -25,14 +25,14 @@
 
 namespace
 {
-  v8::Handle<v8::Script> CompileScript(v8::Isolate* isolate,
+  v8::Local<v8::Script> CompileScript(v8::Isolate* isolate,
     const std::string& source, const std::string& filename)
   {
     using AdblockPlus::Utils::ToV8String;
-    const v8::Handle<v8::String> v8Source = ToV8String(isolate, source);
+    const v8::Local<v8::String> v8Source = ToV8String(isolate, source);
     if (filename.length())
     {
-      const v8::Handle<v8::String> v8Filename = ToV8String(isolate, filename);
+      const v8::Local<v8::String> v8Filename = ToV8String(isolate, filename);
       return v8::Script::Compile(v8Source, v8Filename);
     }
     else
@@ -191,7 +191,7 @@ AdblockPlus::JsValue AdblockPlus::JsEngine::Evaluate(const std::string& source,
 {
   const JsContext context(*this);
   const v8::TryCatch tryCatch(GetIsolate());
-  const v8::Handle<v8::Script> script = CompileScript(GetIsolate(), source,
+  const v8::Local<v8::Script> script = CompileScript(GetIsolate(), source,
     filename);
   CheckTryCatch(tryCatch);
   v8::Local<v8::Value> result = script->Run();

src/JsError.cpp

@@ -19,14 +19,14 @@
 
 using namespace AdblockPlus;
 
-JsError::JsError(const v8::Handle<v8::Value>& exception,
-    const v8::Handle<v8::Message>& message)
+JsError::JsError(const v8::Local<v8::Value>& exception,
+    const v8::Local<v8::Message>& message)
   : std::runtime_error(ExceptionToString(exception, message))
 {
 }
 
-std::string JsError::ExceptionToString(const v8::Handle<v8::Value>& exception,
-  const v8::Handle<v8::Message>& message)
+std::string JsError::ExceptionToString(const v8::Local<v8::Value>& exception,
+  const v8::Local<v8::Message>& message)
 {
   std::stringstream error;
   error << *v8::String::Utf8Value(exception);

src/JsError.h

@@ -27,10 +27,10 @@ namespace AdblockPlus
   class JsError : public std::runtime_error
   {
   public:
-    JsError(const v8::Handle<v8::Value>& exception,
-            const v8::Handle<v8::Message>& message);
-    static std::string ExceptionToString(const v8::Handle<v8::Value>& exception,
-      const v8::Handle<v8::Message>& message);
+    JsError(const v8::Local<v8::Value>& exception,
+            const v8::Local<v8::Message>& message);
+    static std::string ExceptionToString(const v8::Local<v8::Value>& exception,
+      const v8::Local<v8::Message>& message);
 
   };
 }

src/JsValue.cpp

@@ -25,7 +25,7 @@
 using namespace AdblockPlus;
 
 AdblockPlus::JsValue::JsValue(AdblockPlus::JsEnginePtr jsEngine,
-      v8::Handle<v8::Value> value)
+      v8::Local<v8::Value> value)
     : jsEngine(jsEngine),
       value(new v8::Global<v8::Value>(jsEngine->GetIsolate(), value))
 {
@@ -188,7 +188,7 @@ AdblockPlus::JsValue AdblockPlus::JsValue::GetProperty(const std::string& name)
   return JsValue(jsEngine, obj->Get(property));
 }
 
-void AdblockPlus::JsValue::SetProperty(const std::string& name, v8::Handle<v8::Value> val)
+void AdblockPlus::JsValue::SetProperty(const std::string& name, v8::Local<v8::Value> val)
 {
   if (!IsObject())
     throw std::runtime_error("Attempting to set property on a non-object");
@@ -246,7 +246,7 @@ std::string AdblockPlus::JsValue::GetClass() const
 JsValue JsValue::Call(const JsValueList& params) const
 {
   const JsContext context(*jsEngine);
-  std::vector<v8::Handle<v8::Value>> argv;
+  std::vector<v8::Local<v8::Value>> argv;
   for (const auto& param : params)
     argv.push_back(param.UnwrapValue());
 
@@ -258,7 +258,7 @@ JsValue JsValue::Call(const JsValueList& params, const JsValue& thisValue) const
   const JsContext context(*jsEngine);
   v8::Local<v8::Object> thisObj = v8::Local<v8::Object>::Cast(thisValue.UnwrapValue());
 
-  std::vector<v8::Handle<v8::Value>> argv;
+  std::vector<v8::Local<v8::Value>> argv;
   for (const auto& param : params)
     argv.push_back(param.UnwrapValue());
 
@@ -269,13 +269,13 @@ JsValue JsValue::Call(const JsValue& arg) const
 {
   const JsContext context(*jsEngine);
 
-  std::vector<v8::Handle<v8::Value>> argv;
+  std::vector<v8::Local<v8::Value>> argv;
   argv.push_back(arg.UnwrapValue());
 
   return Call(argv, context.GetV8Context()->Global());
 }
 
-JsValue JsValue::Call(std::vector<v8::Handle<v8::Value>>& args, v8::Local<v8::Object> thisObj) const
+JsValue JsValue::Call(std::vector<v8::Local<v8::Value>>& args, v8::Local<v8::Object> thisObj) const
 {
   if (!IsFunction())
     throw std::runtime_error("Attempting to call a non-function");

src/Utils.cpp

@@ -26,7 +26,7 @@
 
 using namespace AdblockPlus;
 
-std::string Utils::FromV8String(const v8::Handle<v8::Value>& value)
+std::string Utils::FromV8String(const v8::Local<v8::Value>& value)
 {
   v8::String::Utf8Value stringValue(value);
   if (stringValue.length())
@@ -35,7 +35,7 @@ std::string Utils::FromV8String(const v8::Handle<v8::Value>& value)
     return std::string();
 }
 
-StringBuffer Utils::StringBufferFromV8String(const v8::Handle<v8::Value>& value)
+StringBuffer Utils::StringBufferFromV8String(const v8::Local<v8::Value>& value)
 {
   v8::String::Utf8Value stringValue(value);
   if (stringValue.length())

src/Utils.h

@@ -31,8 +31,8 @@ namespace AdblockPlus
 {
   namespace Utils
   {
-    std::string FromV8String(const v8::Handle<v8::Value>& value);
-    StringBuffer StringBufferFromV8String(const v8::Handle<v8::Value>& value);
+    std::string FromV8String(const v8::Local<v8::Value>& value);
+    StringBuffer StringBufferFromV8String(const v8::Local<v8::Value>& value);
     v8::Local<v8::String> ToV8String(v8::Isolate* isolate, const std::string& str);
     v8::Local<v8::String> StringBufferToV8String(v8::Isolate* isolate, const StringBuffer& bytes);
     void ThrowExceptionInJS(v8::Isolate* isolate, const std::string& str);