Issue 5013 - Use const JsValue and pass reference where applicable

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 155 matching lines @@
 {
   FilterEnginePtr filterEngine(new FilterEngine(jsEngine));
   auto sync = std::make_shared<Sync>();
   auto isConnectionAllowedCallback = params.isConnectionAllowedCallback;
   if (isConnectionAllowedCallback)
     jsEngine->SetIsConnectionAllowedCallback([sync, jsEngine]()->bool
     {
       sync->Wait();
       return jsEngine->IsConnectionAllowed();
     });
-  jsEngine->SetEventCallback("_init", [jsEngine, filterEngine, onCreated, sync, isConnectionAllowedCallback](const JsValueList& params)
+  jsEngine->SetEventCallback("_init", [jsEngine, filterEngine, onCreated, sync, isConnectionAllowedCallback](const JsConstValueList& params)
   {
     filterEngine->firstRun = params.size() && params[0]->AsBool();
     if (isConnectionAllowedCallback)
     {
       std::weak_ptr<FilterEngine> weakFilterEngine = filterEngine;
       jsEngine->SetIsConnectionAllowedCallback([weakFilterEngine, isConnectionAllowedCallback]()->bool
       {
         auto filterEngine = weakFilterEngine.lock();
         if (!filterEngine)
           return false;
         return isConnectionAllowedCallback(filterEngine->GetAllowedConnectionType().get());
       });
     }
     sync->Set();
     onCreated(filterEngine);
     jsEngine->RemoveEventCallback("_init");
   });
 
   // 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 238 matching lines @@
       std::bind(&FilterEngine::UpdateAvailable, this, callback,
                 std::placeholders::_1));
 }
 
 void FilterEngine::RemoveUpdateAvailableCallback()
 {
   jsEngine->RemoveEventCallback("updateAvailable");
 }
 
 void FilterEngine::UpdateAvailable(
-    const FilterEngine::UpdateAvailableCallback& callback, const JsValueList& params) const
+    const FilterEngine::UpdateAvailableCallback& callback, const JsConstValueList& params) const
 {
   if (params.size() >= 1 && !params[0]->IsNull())
     callback(params[0]->AsString());
 }
 
 void FilterEngine::ForceUpdateCheck(
     const FilterEngine::UpdateCheckDoneCallback& callback)
 {
   JsValuePtr func = jsEngine->Evaluate("API.forceUpdateCheck");
   JsConstValueList params;
   if (callback)
   {
     std::string eventName = "_updateCheckDone" + std::to_string(++updateCheckId);
     jsEngine->SetEventCallback(eventName, std::bind(&FilterEngine::UpdateCheckDone,
       this, eventName, callback, std::placeholders::_1));
     params.push_back(jsEngine->NewValue(eventName));
   }
   func->Call(params);
 }
 
 void FilterEngine::UpdateCheckDone(const std::string& eventName,
-    const FilterEngine::UpdateCheckDoneCallback& callback, const JsValueList& params)
+    const FilterEngine::UpdateCheckDoneCallback& callback, const JsConstValueList& params)
 {
   jsEngine->RemoveEventCallback(eventName);
 
   std::string error(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
   callback(error);
 }
 
 void FilterEngine::SetFilterChangeCallback(const FilterEngine::FilterChangeCallback& callback)
 {
   jsEngine->SetEventCallback("filterChange", std::bind(&FilterEngine::FilterChanged,
@@ skipping 11 matching lines @@
 }
 
 std::unique_ptr<std::string> FilterEngine::GetAllowedConnectionType() const
 {
    auto prefValue = GetPref("allowed_connection_type");
    if (prefValue->AsString().empty())
      return nullptr;
    return std::unique_ptr<std::string>(new std::string(prefValue->AsString()));
 }
 
-void FilterEngine::FilterChanged(const FilterEngine::FilterChangeCallback& callback, const JsValueList& params) const
+void FilterEngine::FilterChanged(const FilterEngine::FilterChangeCallback& callback, const JsConstValueList& params) const
 {
   std::string action(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
-  JsValuePtr item(params.size() >= 2 ? params[1] : jsEngine->NewValue(false));
+  JsConstValuePtr item(params.size() >= 2 ? params[1] : jsEngine->NewValue(false));
   callback(action, *item);
 }
 
 void FilterEngine::ShowNotification(const ShowNotificationCallback& callback,
-                                         const JsValueList& params) const
+                                         const JsConstValueList& params) const
 {
   if (params.size() < 1)
     return;
 
   if (!params[0]->IsObject())
   {
     return;
   }
-  callback(NotificationPtr(new Notification(std::move(*params[0]))));
+  callback(NotificationPtr(new Notification(params[0]->Clone())));

[hub, 2017/04/12 15:28:20]

This is the tricky part. Before that patch we receive a list of values and we
want to move it to the Notification instance.

Because params is now const, we can't move (IMHO this is better), and I had to
implement clone as I couldn't figure out a better way to have a copy of the
JsValue. If you prefer an actual copy constructor, I'm fine with that.

 }
 
 
 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2) const
 {
   JsConstValueList params;
   params.push_back(jsEngine->NewValue(v1));
   params.push_back(jsEngine->NewValue(v2));
   JsValuePtr func = jsEngine->Evaluate("API.compareVersions");
   return func->Call(params).AsInt();
@@ skipping 27 matching lines @@
     FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parentUrl);
     if (filter)
     {
       return filter;
     }
     currentUrl = parentUrl;
   }
   while (urlIterator != documentUrls.end());
   return FilterPtr();
 }