Issue 3363 - Implement IsDocumentWhitelisted and IsElemhideWhitelisted

src/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 310 matching lines @@
       return match;
     lastDocumentUrl = documentUrl;
   }
 
   return CheckFilterMatch(url, contentType, lastDocumentUrl);
 }
 
 bool FilterEngine::IsDocumentWhitelisted(const std::string& url,
     const std::vector<std::string>& documentUrls) const
 {
-    return GetWhitelistingFilter(url, documentUrls,
-        CONTENT_TYPE_DOCUMENT) != 0;
+    return !!GetWhitelistingFilter(url, CONTENT_TYPE_DOCUMENT, documentUrls);
 }
 
 bool FilterEngine::IsElemhideWhitelisted(const std::string& url,
     const std::vector<std::string>& documentUrls) const
 {
-    return GetWhitelistingFilter(url, documentUrls,
-        CONTENT_TYPE_ELEMHIDE) != 0;
+    return !!GetWhitelistingFilter(url, CONTENT_TYPE_ELEMHIDE, documentUrls);
 }
 
 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)));
@@ skipping 121 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,
-  const std::string& parent, ContentType contentType) const
-{
-  FilterPtr match = Matches(url, contentType, parent);
-
+  ContentType contentType, const std::string& documentUrl) const
+{
+  FilterPtr match = Matches(url, contentType, documentUrl);
   if (match && match->GetType() == Filter::TYPE_EXCEPTION)
   {
     return match;
   }
   return FilterPtr();
 }
 
 FilterPtr FilterEngine::GetWhitelistingFilter(const std::string& url,
-  const std::vector<std::string>& documentUrls,
-  ContentType contentType) const
+  ContentType contentType,
+  const std::vector<std::string>& documentUrls) const
 {
   if (documentUrls.empty())
   {
-    return GetWhitelistingFilter(url, "", contentType);
+    return GetWhitelistingFilter(url, contentType, "");
   }
 
   std::vector<std::string>::const_iterator urlIterator = documentUrls.begin();
   std::string currentUrl = url;
   do
   {
     std::string parentUrl = *urlIterator++;
     FilterPtr filter = GetWhitelistingFilter(
-                         currentUrl, parentUrl, contentType);
+                         currentUrl, contentType, parentUrl);
     if (filter)
     {
       return filter;
     }
     currentUrl = parentUrl;
   }
   while (urlIterator != documentUrls.end());
   return FilterPtr();
 }