Issue 5189 - use r-value references when objects should be transferred

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 199 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](JsValueList&& 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;
@@ skipping 150 matching lines @@
 {
   JsValue func = jsEngine->Evaluate("API.showNextNotification");
   JsValueList params;
   if (!url.empty())
   {
     params.push_back(jsEngine->NewValue(url));
   }
   func.Call(params);
 }
 
-void FilterEngine::SetShowNotificationCallback(const ShowNotificationCallback& value)
+void FilterEngine::SetShowNotificationCallback(const ShowNotificationCallback& callback)
 {
-  if (!value)
+  if (!callback)
     return;
 
-  jsEngine->SetEventCallback("_showNotification",
-    std::bind(&FilterEngine::ShowNotification, this, value,
-              std::placeholders::_1));
+  jsEngine->SetEventCallback("_showNotification", [this, callback](JsValueList&& params)
+  {
+    if (params.size() < 1 || !params[0].IsObject())
+      return;
+
+    callback(Notification(std::move(params[0])));
+  });
 }
 
 void FilterEngine::RemoveShowNotificationCallback()
 {
   jsEngine->RemoveEventCallback("_showNotification");
 }
 
 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
     ContentTypeMask contentTypeMask,
     const std::string& documentUrl) const
@@ skipping 78 matching lines @@
 
 std::string FilterEngine::GetHostFromURL(const std::string& url) const
 {
   JsValue func = jsEngine->Evaluate("API.getHostFromUrl");
   return func.Call(jsEngine->NewValue(url)).AsString();
 }
 
 void FilterEngine::SetUpdateAvailableCallback(
     const FilterEngine::UpdateAvailableCallback& callback)
 {
-  jsEngine->SetEventCallback("updateAvailable",
-      std::bind(&FilterEngine::UpdateAvailable, this, callback,
-                std::placeholders::_1));
+  jsEngine->SetEventCallback("updateAvailable", [this, callback](JsValueList&& params)
+  {
+    if (params.size() >= 1 && !params[0].IsNull())
+      callback(params[0].AsString());
+  });
 }
 
 void FilterEngine::RemoveUpdateAvailableCallback()
 {
   jsEngine->RemoveEventCallback("updateAvailable");
 }
 
-void FilterEngine::UpdateAvailable(
-    const FilterEngine::UpdateAvailableCallback& callback, const JsValueList& params) const
-{
-  if (params.size() >= 1 && !params[0].IsNull())
-    callback(params[0].AsString());
-}
-
 void FilterEngine::ForceUpdateCheck(
     const FilterEngine::UpdateCheckDoneCallback& callback)
 {
   JsValue func = jsEngine->Evaluate("API.forceUpdateCheck");
   JsValueList params;
   if (callback)
   {
     std::string eventName = "_updateCheckDone" + std::to_string(++updateCheckId);
-    jsEngine->SetEventCallback(eventName, std::bind(&FilterEngine::UpdateCheckDone,
-      this, eventName, callback, std::placeholders::_1));
+    jsEngine->SetEventCallback(eventName, [this, eventName, callback](JsValueList&& params)
+    {
+      std::string error(params.size() >= 1 && !params[0].IsNull() ? params[0].AsString() : "");
+      callback(error);
+      jsEngine->RemoveEventCallback(eventName);
+    });
     params.push_back(jsEngine->NewValue(eventName));
   }
   func.Call(params);
 }
 
-void FilterEngine::UpdateCheckDone(const std::string& eventName,
-    const FilterEngine::UpdateCheckDoneCallback& callback, const JsValueList& params)
+void FilterEngine::SetFilterChangeCallback(const FilterChangeCallback& callback)
 {
-  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,
-      this, callback, std::placeholders::_1));
+  jsEngine->SetEventCallback("filterChange", [this, callback](JsValueList&& params)
+  {
+    this->FilterChanged(callback, move(params));
+  });
 }
 
 void FilterEngine::RemoveFilterChangeCallback()
 {
   jsEngine->RemoveEventCallback("filterChange");
 }
 
 void FilterEngine::SetAllowedConnectionType(const std::string* value)
 {
   SetPref("allowed_connection_type", value ? jsEngine->NewValue(*value) : jsEngine->NewValue(""));
 }
 
 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, JsValueList&& params) const
 {
   std::string action(params.size() >= 1 && !params[0].IsNull() ? params[0].AsString() : "");
   JsValue item(params.size() >= 2 ? params[1] : jsEngine->NewValue(false));
-  callback(action, item);
+  callback(action, std::move(item));
 }
 
-void FilterEngine::ShowNotification(const ShowNotificationCallback& callback,
-                                         const JsValueList& params) const
-{
-  if (params.size() < 1)
-    return;
-
-  if (!params[0].IsObject())
-  {
-    return;
-  }
-  auto notification = Notification(JsValue(params[0]));
-  callback(notification);
-}
-
-
 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2) const
 {
   JsValueList params;
   params.push_back(jsEngine->NewValue(v1));
   params.push_back(jsEngine->NewValue(v2));
   JsValue func = jsEngine->Evaluate("API.compareVersions");
   return func.Call(params).AsInt();
 }
 
 FilterPtr FilterEngine::GetWhitelistingFilter(const std::string& url,
@@ skipping 24 matching lines @@
     FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parentUrl);
     if (filter)
     {
       return filter;
     }
     currentUrl = parentUrl;
   }
   while (urlIterator != documentUrls.end());
   return FilterPtr();
 }