Issue 3589 - Change return type of AdblockPlus::JsValue::Call from pointer to r-value object.

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 39 matching lines @@
     return TYPE_COMMENT;
   else
     return TYPE_INVALID;
 }
 
 bool Filter::IsListed()
 {
   JsValuePtr func = jsEngine->Evaluate("API.isListedFilter");
   JsValueList params;
   params.push_back(shared_from_this());
-  return func->Call(params)->AsBool();
+  return func->Call(params).AsBool();
 }
 
 void Filter::AddToList()
 {
   JsValuePtr func = jsEngine->Evaluate("API.addFilterToList");
   JsValueList params;
   params.push_back(shared_from_this());
   func->Call(params);
 }
 
@@ skipping 15 matching lines @@
 {
   if (!IsObject())
     throw std::runtime_error("JavaScript value is not an object");
 }
 
 bool Subscription::IsListed()
 {
   JsValuePtr func = jsEngine->Evaluate("API.isListedSubscription");
   JsValueList params;
   params.push_back(shared_from_this());
-  return func->Call(params)->AsBool();
+  return func->Call(params).AsBool();
 }
 
 void Subscription::AddToList()
 {
   JsValuePtr func = jsEngine->Evaluate("API.addSubscriptionToList");
   JsValueList params;
   params.push_back(shared_from_this());
   func->Call(params);
 }
 
@@ skipping 11 matching lines @@
   JsValueList params;
   params.push_back(shared_from_this());
   func->Call(params);
 }
 
 bool Subscription::IsUpdating()
 {
   JsValuePtr func = jsEngine->Evaluate("API.isSubscriptionUpdating");
   JsValueList params;
   params.push_back(shared_from_this());
-  JsValuePtr result = func->Call(params);
-  return result->AsBool();
+  JsValue result = func->Call(params);
+  return result.AsBool();
 }
 
 bool Subscription::operator==(const Subscription& subscription) const
 {
   return GetProperty("url")->AsString() == subscription.GetProperty("url")->AsString();
 }
 
 FilterEngine::FilterEngine(JsEnginePtr jsEngine,
                            const FilterEngine::Prefs& preconfiguredPrefs)
     : jsEngine(jsEngine), initialized(false), firstRun(false), updateCheckId(0)
@@ skipping 80 matching lines @@
 bool FilterEngine::IsFirstRun() const
 {
   return firstRun;
 }
 
 FilterPtr FilterEngine::GetFilter(const std::string& text)
 {
   JsValuePtr func = jsEngine->Evaluate("API.getFilterFromText");
   JsValueList params;
   params.push_back(jsEngine->NewValue(text));
-  return FilterPtr(new Filter(std::move(*func->Call(params))));
+  return FilterPtr(new Filter(func->Call(params)));
 }
 
 SubscriptionPtr FilterEngine::GetSubscription(const std::string& url)
 {
   JsValuePtr func = jsEngine->Evaluate("API.getSubscriptionFromUrl");
   JsValueList params;
   params.push_back(jsEngine->NewValue(url));
-  return SubscriptionPtr(new Subscription(std::move(*func->Call(params))));
+  return SubscriptionPtr(new Subscription(func->Call(params)));
 }
 
 std::vector<FilterPtr> FilterEngine::GetListedFilters() const
 {
   JsValuePtr func = jsEngine->Evaluate("API.getListedFilters");
-  JsValueList values = func->Call()->AsList();
+  JsValueList values = func->Call().AsList();
   std::vector<FilterPtr> result;
   for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
     result.push_back(FilterPtr(new Filter(std::move(**it))));
   return result;
 }
 
 std::vector<SubscriptionPtr> FilterEngine::GetListedSubscriptions() const
 {
   JsValuePtr func = jsEngine->Evaluate("API.getListedSubscriptions");
-  JsValueList values = func->Call()->AsList();
+  JsValueList values = func->Call().AsList();
   std::vector<SubscriptionPtr> result;
   for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
     result.push_back(SubscriptionPtr(new Subscription(std::move(**it))));
   return result;
 }
 
 std::vector<SubscriptionPtr> FilterEngine::FetchAvailableSubscriptions() const
 {
   JsValuePtr func = jsEngine->Evaluate("API.getRecommendedSubscriptions");
-  JsValueList values = func->Call()->AsList();
+  JsValueList values = func->Call().AsList();
   std::vector<SubscriptionPtr> result;
   for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
     result.push_back(SubscriptionPtr(new Subscription(std::move(**it))));
   return result;
 }
 
 void FilterEngine::ShowNextNotification(const std::string& url)
 {
   JsValuePtr func = jsEngine->Evaluate("API.showNextNotification");
   JsValueList params;
@@ skipping 64 matching lines @@
 
 AdblockPlus::FilterPtr FilterEngine::CheckFilterMatch(const std::string& url,
     ContentType contentType,
     const std::string& documentUrl) const
 {
   JsValuePtr func = jsEngine->Evaluate("API.checkFilterMatch");
   JsValueList params;
   params.push_back(jsEngine->NewValue(url));
   params.push_back(jsEngine->NewValue(ContentTypeToString(contentType)));
   params.push_back(jsEngine->NewValue(documentUrl));
-  JsValuePtr result = func->Call(params);
-  if (!result->IsNull())
-    return FilterPtr(new Filter(std::move(*result)));
+  JsValue result = func->Call(params);
+  if (!result.IsNull())
+    return FilterPtr(new Filter(std::move(result)));
   else
     return FilterPtr();
 }
 
 std::vector<std::string> FilterEngine::GetElementHidingSelectors(const std::string& domain) const
 {
   JsValuePtr func = jsEngine->Evaluate("API.getElementHidingSelectors");
   JsValueList params;
   params.push_back(jsEngine->NewValue(domain));
-  JsValueList result = func->Call(params)->AsList();
+  JsValueList result = func->Call(params).AsList();
   std::vector<std::string> selectors;
   for (JsValueList::iterator it = result.begin(); it != result.end(); ++it)
     selectors.push_back((*it)->AsString());
   return selectors;
 }
 
 JsValuePtr FilterEngine::GetPref(const std::string& pref) const
 {
   JsValuePtr func = jsEngine->Evaluate("API.getPref");
   JsValueList params;
   params.push_back(jsEngine->NewValue(pref));
-  return func->Call(params);
+  return std::make_shared<JsValue>(func->Call(params));

[Oleksandr, 2016/01/31 21:23:24]

Nit: This reminds me - isn't it time to drop use of std::tr1 namespace and just
use std::shared_ptr in JsValue.h?

[Eric, 2016/02/08 19:54:50]

It's already been done in the libadblockplus repository, but it follows after
the version that's referenced in adblockplusie at present.

libadblockplus 4591bf6e9287a2567363d775a3b2da3e8b6e69e4

 }
 
 void FilterEngine::SetPref(const std::string& pref, JsValuePtr value)
 {
   JsValuePtr func = jsEngine->Evaluate("API.setPref");
   JsValueList params;
   params.push_back(jsEngine->NewValue(pref));
   params.push_back(value);
   func->Call(params);
 }
 
 std::string FilterEngine::GetHostFromURL(const std::string& url)
 {
   JsValuePtr func = jsEngine->Evaluate("API.getHostFromUrl");
   JsValueList params;
   params.push_back(jsEngine->NewValue(url));
-  return func->Call(params)->AsString();
+  return func->Call(params).AsString();
 }
 
 void FilterEngine::SetUpdateAvailableCallback(
     FilterEngine::UpdateAvailableCallback callback)
 {
   jsEngine->SetEventCallback("updateAvailable",
       std::bind(&FilterEngine::UpdateAvailable, this, callback,
                 std::placeholders::_1));
 }
 
@@ skipping 64 matching lines @@
   callback(NotificationPtr(new Notification(std::move(*params[0]))));
 }
 
 
 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2)
 {
   JsValueList params;
   params.push_back(jsEngine->NewValue(v1));
   params.push_back(jsEngine->NewValue(v2));
   JsValuePtr func = jsEngine->Evaluate("API.compareVersions");
-  return func->Call(params)->AsInt();
+  return func->Call(params).AsInt();
 }
 
 FilterPtr FilterEngine::GetWhitelistingFilter(const std::string& url,
   ContentType contentType, const std::string& documentUrl) const
 {
   FilterPtr match = Matches(url, contentType, documentUrl);
   if (match && match->GetType() == Filter::TYPE_EXCEPTION)
   {
     return match;
   }
@@ skipping 18 matching lines @@
                          currentUrl, contentType, parentUrl);
     if (filter)
     {
       return filter;
     }
     currentUrl = parentUrl;
   }
   while (urlIterator != documentUrls.end());
   return FilterPtr();
 }