Issue 1550 - Get rid of V8ValueHolder.h

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 160 matching lines @@
   ContentTypeMap CreateContentTypeMap()
   {
     ContentTypeMap contentTypes;
     contentTypes[FilterEngine::CONTENT_TYPE_OTHER] = "OTHER";
     contentTypes[FilterEngine::CONTENT_TYPE_SCRIPT] = "SCRIPT";
     contentTypes[FilterEngine::CONTENT_TYPE_IMAGE] = "IMAGE";
     contentTypes[FilterEngine::CONTENT_TYPE_STYLESHEET] = "STYLESHEET";
     contentTypes[FilterEngine::CONTENT_TYPE_OBJECT] = "OBJECT";
     contentTypes[FilterEngine::CONTENT_TYPE_SUBDOCUMENT] = "SUBDOCUMENT";
     contentTypes[FilterEngine::CONTENT_TYPE_DOCUMENT] = "DOCUMENT";
+    contentTypes[FilterEngine::CONTENT_TYPE_PING] = "PING";
     contentTypes[FilterEngine::CONTENT_TYPE_XMLHTTPREQUEST] = "XMLHTTPREQUEST";
     contentTypes[FilterEngine::CONTENT_TYPE_OBJECT_SUBREQUEST] = "OBJECT_SUBREQUEST";
     contentTypes[FilterEngine::CONTENT_TYPE_FONT] = "FONT";
     contentTypes[FilterEngine::CONTENT_TYPE_MEDIA] = "MEDIA";
     contentTypes[FilterEngine::CONTENT_TYPE_ELEMHIDE] = "ELEMHIDE";
+    contentTypes[FilterEngine::CONTENT_TYPE_GENERICBLOCK] = "GENERICBLOCK";
+    contentTypes[FilterEngine::CONTENT_TYPE_GENERICHIDE] = "GENERICHIDE";
     return contentTypes;
   }
 }
 
 const ContentTypeMap FilterEngine::contentTypes = CreateContentTypeMap();
 
 std::string FilterEngine::ContentTypeToString(ContentType contentType)
 {
   ContentTypeMap::const_iterator it = contentTypes.find(contentType);
   if (it != contentTypes.end())
@@ skipping 24 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))));

[Eric, 2016/01/26 18:37:40]

Why is 'move' necessary here? The value is already temporary.

[sergei, 2016/01/27 10:21:14]

Compiler generates an error here because it's not temporary. `Call` returns
std::shared_ptr<AdblockPlus::JsValue>, dereferencing of it gives a reference to
the held object.

Strictly speaking, `Call` should return rather `JsValue` (which is temporary and
JsValue&&) instead of std::shared_ptr but it introduces a lot of non-relevant
changes which IMO should be made in another commit.

[sergei, 2016/01/27 11:23:02]

FYI: https://codereview.adblockplus.org/29334678/

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

That change set belongs here. You're adding a bunch of 'std::move' calls here
and then immediately taking them out again. That's should really be an indicator
that the changes are closely related.

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

OK.

 }
 
 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))));
 }
 
@@ skipping 47 matching lines @@
     std::bind(&FilterEngine::ShowNotification, this, value,
               std::placeholders::_1));
 }
 
 void FilterEngine::RemoveShowNotificationCallback()
 {
   jsEngine->RemoveEventCallback("_showNotification");
 }
 
 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
-    ContentType contentType,
+    ContentTypeMask contentTypeMask,
     const std::string& documentUrl) const
 {
   std::vector<std::string> documentUrls;
   documentUrls.push_back(documentUrl);
-  return Matches(url, contentType, documentUrls);
+  return Matches(url, contentTypeMask, documentUrls);
 }
 
 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
-    ContentType contentType,
+    ContentTypeMask contentTypeMask,
     const std::vector<std::string>& documentUrls) const
 {
   if (documentUrls.empty())
-    return CheckFilterMatch(url, contentType, "");
+    return CheckFilterMatch(url, contentTypeMask, "");
 
   std::string lastDocumentUrl = documentUrls.front();
   for (std::vector<std::string>::const_iterator it = documentUrls.begin();
        it != documentUrls.end(); it++) {
     const std::string documentUrl = *it;
     AdblockPlus::FilterPtr match = CheckFilterMatch(documentUrl,
                                                     CONTENT_TYPE_DOCUMENT,
                                                     lastDocumentUrl);
     if (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION)
       return match;
     lastDocumentUrl = documentUrl;
   }
 
-  return CheckFilterMatch(url, contentType, lastDocumentUrl);
+  return CheckFilterMatch(url, contentTypeMask, lastDocumentUrl);
 }
 
 bool FilterEngine::IsDocumentWhitelisted(const std::string& url,
     const std::vector<std::string>& documentUrls) const
 {
     return !!GetWhitelistingFilter(url, CONTENT_TYPE_DOCUMENT, documentUrls);
 }
 
 bool FilterEngine::IsElemhideWhitelisted(const std::string& url,
     const std::vector<std::string>& documentUrls) const
 {
     return !!GetWhitelistingFilter(url, CONTENT_TYPE_ELEMHIDE, documentUrls);
 }
 
 AdblockPlus::FilterPtr FilterEngine::CheckFilterMatch(const std::string& url,
-    ContentType contentType,
+    ContentTypeMask contentTypeMask,
     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(contentTypeMask));
   params.push_back(jsEngine->NewValue(documentUrl));
   JsValuePtr 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
 {
@@ skipping 111 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();
 }
 
 FilterPtr FilterEngine::GetWhitelistingFilter(const std::string& url,
-  ContentType contentType, const std::string& documentUrl) const
-{
-  FilterPtr match = Matches(url, contentType, documentUrl);
+  ContentTypeMask contentTypeMask, const std::string& documentUrl) const
+{
+  FilterPtr match = Matches(url, contentTypeMask, documentUrl);
   if (match && match->GetType() == Filter::TYPE_EXCEPTION)
   {
     return match;
   }
   return FilterPtr();
 }
 
 FilterPtr FilterEngine::GetWhitelistingFilter(const std::string& url,
-  ContentType contentType,
+  ContentTypeMask contentTypeMask,
   const std::vector<std::string>& documentUrls) const
 {
   if (documentUrls.empty())
   {
-    return GetWhitelistingFilter(url, contentType, "");
+    return GetWhitelistingFilter(url, contentTypeMask, "");
   }
 
   std::vector<std::string>::const_iterator urlIterator = documentUrls.begin();
   std::string currentUrl = url;
   do
   {
     std::string parentUrl = *urlIterator++;
-    FilterPtr filter = GetWhitelistingFilter(
-                         currentUrl, contentType, parentUrl);
+    FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parentUrl);
     if (filter)
     {
       return filter;
     }
     currentUrl = parentUrl;
   }
   while (urlIterator != documentUrls.end());
   return FilterPtr();
 }