Issue #4692 - Rewrite web request task to avoid engine self-reference

src/JsValue.cpp

 /*
  * 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 78 matching lines @@
   const JsContext context(jsEngine);
   return UnwrapValue()->IsArray();
 }
 
 bool AdblockPlus::JsValue::IsFunction() const
 {
   const JsContext context(jsEngine);
   return UnwrapValue()->IsFunction();
 }
 
+std::tuple<bool, std::string> ConvertString(v8::Local<v8::Value> v8value)
+{
+  if (!(v8value->IsString() || v8value->IsStringObject()))
+  {
+    return std::make_tuple(false, std::string());
+  }
+  return std::make_tuple(true, AdblockPlus::Utils::FromV8String(v8value));
+}
+
 std::string AdblockPlus::JsValue::AsString() const
 {
   const JsContext context(jsEngine);
   return Utils::FromV8String(UnwrapValue());
 }
 
 int64_t AdblockPlus::JsValue::AsInt() const
 {
   const JsContext context(jsEngine);
   return UnwrapValue()->IntegerValue();
@@ skipping 51 matching lines @@
 void AdblockPlus::JsValue::SetProperty(const std::string& name, v8::Handle<v8::Value> val)
 {
   if (!IsObject())
     throw new std::runtime_error("Attempting to set property on a non-object");
 
   v8::Local<v8::String> property = Utils::ToV8String(jsEngine->GetIsolate(), name);
   v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue());
   obj->Set(property, val);
 }
 
+void SetPropertyOnV8Object(v8::Isolate* isolate, v8::Local<v8::Object>& target, const std::string& propertyName, const v8::Handle<v8::Value>& propertyValue)
+{
+  auto v8PropertyName = AdblockPlus::Utils::ToV8String(isolate, propertyName);
+  target->Set(v8PropertyName, propertyValue);
+}
+
 v8::Local<v8::Value> AdblockPlus::JsValue::UnwrapValue() const
 {
   return v8::Local<v8::Value>::New(jsEngine->GetIsolate(), *value);
 }
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, const std::string& val)
 {
   const JsContext context(jsEngine);
   SetProperty(name, Utils::ToV8String(jsEngine->GetIsolate(), val));
 }
 
+void SetPropertyOnV8Object(v8::Isolate* isolate, v8::Local<v8::Object>& target, const std::string& propertyName, const std::string& propertyValue)
+{
+  SetPropertyOnV8Object(isolate, target, propertyName, AdblockPlus::Utils::ToV8String(isolate, propertyValue));
+}
+
 void AdblockPlus::JsValue::SetProperty(const std::string& name, int64_t val)
 {
   const JsContext context(jsEngine);
   SetProperty(name, v8::Number::New(jsEngine->GetIsolate(), val));
 }
 
+void SetPropertyOnV8Object(v8::Isolate* isolate, v8::Local<v8::Object>& target, const std::string& propertyName, int64_t propertyValue)
+{
+  SetPropertyOnV8Object(isolate, target, propertyName, v8::Number::New(isolate, propertyValue));
+}
+
 void AdblockPlus::JsValue::SetProperty(const std::string& name, const JsValuePtr& val)
 {
   const JsContext context(jsEngine);
   SetProperty(name, val->UnwrapValue());
 }
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, bool val)
 {
   const JsContext context(jsEngine);
   SetProperty(name, v8::Boolean::New(val));
@@ skipping 38 matching lines @@
   return JsValuePtr(new JsValue(jsEngine, result));
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsValue& arg) const
 {
   const JsContext context(jsEngine);
   JsValueList params;
   params.push_back(JsValuePtr(new JsValue(arg.jsEngine, arg.UnwrapValue())));
   return Call(params);
 }