Issue 5034 - Part 1: Pass a JsValue directly to SetProperty() and return from GetProperty()

src/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 56 matching lines @@
 }
 
 void Filter::RemoveFromList()
 {
   JsValuePtr func = jsEngine->Evaluate("API.removeFilterFromList");
   func->Call(*this);
 }
 
 bool Filter::operator==(const Filter& filter) const
 {
-  return GetProperty("text")->AsString() == filter.GetProperty("text")->AsString();
+  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() const
@@ skipping 26 matching lines @@
   return func->Call(*this).AsBool();
 }
 
 bool Subscription::IsAA() const
 {
   return jsEngine->Evaluate("API.isAASubscription")->Call(*this).AsBool();
 }
 
 bool Subscription::operator==(const Subscription& subscription) const
 {
-  return GetProperty("url")->AsString() == subscription.GetProperty("url")->AsString();
+  return GetProperty("url").AsString() == subscription.GetProperty("url").AsString();
 }
 
 namespace
 {
   class Sync
   {
   public:
     Sync()
       :initialized(false)
     {
@@ skipping 59 matching lines @@
 
   // Lock the JS engine while we are loading scripts, no timeouts should fire
   // until we are done.
   const JsContext context(jsEngine);
 
   // Set the preconfigured prefs
   JsValuePtr preconfiguredPrefsObject = jsEngine->NewObject();
   for (FilterEngine::Prefs::const_iterator it = params.preconfiguredPrefs.begin();
     it != params.preconfiguredPrefs.end(); it++)
   {
-    preconfiguredPrefsObject->SetProperty(it->first, it->second);
+    preconfiguredPrefsObject->SetProperty(it->first, *it->second);
   }
-  jsEngine->SetGlobalProperty("_preconfiguredPrefs", preconfiguredPrefsObject);
+  jsEngine->SetGlobalProperty("_preconfiguredPrefs", *preconfiguredPrefsObject);
   // Load adblockplus scripts
   for (int i = 0; !jsSources[i].empty(); i += 2)
     jsEngine->Evaluate(jsSources[i + 1], jsSources[i]);
 }
 
 FilterEnginePtr FilterEngine::Create(const JsEnginePtr& jsEngine,
   const FilterEngine::CreationParameters& params)
 {
   FilterEnginePtr retValue;
   Sync sync;
@@ skipping 357 matching lines @@
     FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parentUrl);
     if (filter)
     {
       return filter;
     }
     currentUrl = parentUrl;
   }
   while (urlIterator != documentUrls.end());
   return FilterPtr();
 }