Issue 3594 - remove circular references JsEngine-JsValue-JsEngine

src/FilterEngine.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 36 matching lines @@
   else if (className == "ElemHideException")
     return TYPE_ELEMHIDE_EXCEPTION;
   else if (className == "CommentFilter")
     return TYPE_COMMENT;
   else
     return TYPE_INVALID;
 }
 
 bool Filter::IsListed()
 {
-  JsValuePtr func = jsEngine->Evaluate("API.isListedFilter");
+  JsContext context(jsEngine);
+  JsValuePtr func = context.GetJsEngine().Evaluate("API.isListedFilter");
   JsValueList params;
   params.push_back(shared_from_this());
   return func->Call(params)->AsBool();
 }
 
 void Filter::AddToList()
 {
-  JsValuePtr func = jsEngine->Evaluate("API.addFilterToList");
+  JsContext context(jsEngine);
+  JsValuePtr func = context.GetJsEngine().Evaluate("API.addFilterToList");
   JsValueList params;
   params.push_back(shared_from_this());
   func->Call(params);
 }
 
 void Filter::RemoveFromList()
 {
-  JsValuePtr func = jsEngine->Evaluate("API.removeFilterFromList");
+  JsContext context(jsEngine);
+  JsValuePtr func = context.GetJsEngine().Evaluate("API.removeFilterFromList");
   JsValueList params;
   params.push_back(shared_from_this());
   func->Call(params);
 }
 
 bool Filter::operator==(const Filter& filter) const
 {
   return GetProperty("text")->AsString() == filter.GetProperty("text")->AsString();
 }
 
 Subscription::Subscription(JsValue&& value)
     : JsValue(std::move(value))
 {
   if (!IsObject())
     throw std::runtime_error("JavaScript value is not an object");
 }
 
 bool Subscription::IsListed()
 {
-  JsValuePtr func = jsEngine->Evaluate("API.isListedSubscription");
+  JsContext context(jsEngine);
+  JsValuePtr func = context.GetJsEngine().Evaluate("API.isListedSubscription");
   JsValueList params;
   params.push_back(shared_from_this());
   return func->Call(params)->AsBool();
 }
 
 void Subscription::AddToList()
 {
-  JsValuePtr func = jsEngine->Evaluate("API.addSubscriptionToList");
+  JsContext context(jsEngine);
+  JsValuePtr func = context.GetJsEngine().Evaluate("API.addSubscriptionToList");
   JsValueList params;
   params.push_back(shared_from_this());
   func->Call(params);
 }
 
 void Subscription::RemoveFromList()
 {
-  JsValuePtr func = jsEngine->Evaluate("API.removeSubscriptionFromList");
+  JsContext context(jsEngine);
+  JsValuePtr func = context.GetJsEngine().Evaluate("API.removeSubscriptionFromList");
   JsValueList params;
   params.push_back(shared_from_this());
   func->Call(params);
 }
 
 void Subscription::UpdateFilters()
 {
-  JsValuePtr func = jsEngine->Evaluate("API.updateSubscription");
+  JsContext context(jsEngine);
+  JsValuePtr func = context.GetJsEngine().Evaluate("API.updateSubscription");
   JsValueList params;
   params.push_back(shared_from_this());
   func->Call(params);
 }
 
 bool Subscription::IsUpdating()
 {
-  JsValuePtr func = jsEngine->Evaluate("API.isSubscriptionUpdating");
+  JsContext context(jsEngine);
+  JsValuePtr func = context.GetJsEngine().Evaluate("API.isSubscriptionUpdating");
   JsValueList params;
   params.push_back(shared_from_this());
   JsValuePtr result = func->Call(params);
   return result->AsBool();
 }
 
 bool Subscription::operator==(const Subscription& subscription) const
 {
   return GetProperty("url")->AsString() == subscription.GetProperty("url")->AsString();
 }
@@ skipping 370 matching lines @@
     FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parentUrl);
     if (filter)
     {
       return filter;
     }
     currentUrl = parentUrl;
   }
   while (urlIterator != documentUrls.end());
   return FilterPtr();
 }