Issue 1280 - Update v8, the second part

src/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 10 matching lines @@
 #include <string>
 
 #include <AdblockPlus.h>
 #include "JsContext.h"
 #include "Thread.h"
 
 using namespace AdblockPlus;
 
 extern std::string jsSources[];
 
-Filter::Filter(JsValuePtr value)
-    : JsValue(value)
+Filter::Filter(JsValue&& value)
+  : JsValue{std::move(value)}
 {
   if (!IsObject())
     throw std::runtime_error("JavaScript value is not an object");
 }
 
 Filter::Type Filter::GetType()
 {
   std::string className = GetClass();
   if (className == "BlockingFilter")
     return TYPE_BLOCKING;
@@ skipping 31 matching lines @@
   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(JsValuePtr value)
-    : JsValue(value)
+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");
   JsValueList params;
   params.push_back(shared_from_this());
@@ skipping 40 matching lines @@
 
 FilterEngine::FilterEngine(JsEnginePtr jsEngine)
     : jsEngine(jsEngine), initialized(false), firstRun(false), updateCheckId(0)
 {
   jsEngine->SetEventCallback("init", std::tr1::bind(&FilterEngine::InitDone,
       this, std::tr1::placeholders::_1));
 
   {
     // Lock the JS engine while we are loading scripts, no timeouts should fire
     // until we are done.
-    const JsContext context(jsEngine);
+    const JsContext context{*jsEngine};
     for (int i = 0; !jsSources[i].empty(); i += 2)
       jsEngine->Evaluate(jsSources[i + 1], jsSources[i]);
   }
 
   // TODO: This should really be implemented via a conditional variable
   while (!initialized)
     ::Sleep(10);
 }
 
 namespace
@@ skipping 51 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(func->Call(params)));
+  return std::make_shared<Filter>(std::move(*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(func->Call(params)));
+  return std::make_shared<Subscription>(std::move(*func->Call(params)));
 }
 
 std::vector<FilterPtr> FilterEngine::GetListedFilters() const
 {
   JsValuePtr func = jsEngine->Evaluate("API.getListedFilters");
   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(*it)));
+  for (auto& value : values)
+    result.emplace_back(std::make_shared<Filter>(std::move(*value)));
   return result;
 }
 
 std::vector<SubscriptionPtr> FilterEngine::GetListedSubscriptions() const
 {
   JsValuePtr func = jsEngine->Evaluate("API.getListedSubscriptions");
   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(*it)));
+  for (auto& value : values)
+    result.emplace_back(std::make_shared<Subscription>(std::move(*value)));
   return result;
 }
 
 std::vector<SubscriptionPtr> FilterEngine::FetchAvailableSubscriptions() const
 {
   JsValuePtr func = jsEngine->Evaluate("API.getRecommendedSubscriptions");
   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(*it)));
+  for (auto& value : values)
+    result.emplace_back(std::make_shared<Subscription>(std::move(*value)));
   return result;
 }
 
 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
     ContentType contentType,
     const std::string& documentUrl) const
 {
   std::vector<std::string> documentUrls;
   documentUrls.push_back(documentUrl);
   return Matches(url, contentType, documentUrls);
@@ skipping 25 matching lines @@
     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(result));
+    return std::make_shared<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();
@@ skipping 91 matching lines @@
 }
 
 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();
 }