Issue 1550 - Get rid of V8ValueHolder.h

src/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 113 matching lines @@
   params.push_back(shared_from_this());
   JsValuePtr 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, 
+FilterEngine::FilterEngine(JsEnginePtr jsEngine,
                            const FilterEngine::Prefs& preconfiguredPrefs)
     : jsEngine(jsEngine), initialized(false), firstRun(false), updateCheckId(0)
 {
-  jsEngine->SetEventCallback("_init", std::tr1::bind(&FilterEngine::InitDone,
-      this, std::tr1::placeholders::_1));
+  jsEngine->SetEventCallback("_init", std::bind(&FilterEngine::InitDone,
+      this, std::placeholders::_1));
 
   {
     // Lock the JS engine while we are loading scripts, no timeouts should fire
     // until we are done.
     const JsContext context(jsEngine);
 
     // Set the preconfigured prefs
     JsValuePtr preconfiguredPrefsObject = jsEngine->NewObject();
     for (FilterEngine::Prefs::const_iterator it = preconfiguredPrefs.begin();
          it != preconfiguredPrefs.end(); it++)
@@ skipping 18 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 82 matching lines @@
   }
   func->Call(params);
 }
 
 void FilterEngine::SetShowNotificationCallback(const ShowNotificationCallback& value)
 {
   if (!value)
     return;
 
   jsEngine->SetEventCallback("_showNotification",
-    std::tr1::bind(&FilterEngine::ShowNotification, this, value,
-                   std::tr1::placeholders::_1));
+    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 29 matching lines @@
   JsValuePtr func = jsEngine->Evaluate("API.getHostFromUrl");
   JsValueList params;
   params.push_back(jsEngine->NewValue(url));
   return func->Call(params)->AsString();
 }
 
 void FilterEngine::SetUpdateAvailableCallback(
     FilterEngine::UpdateAvailableCallback callback)
 {
   jsEngine->SetEventCallback("updateAvailable",
-      std::tr1::bind(&FilterEngine::UpdateAvailable, this, callback,
-                     std::tr1::placeholders::_1));
+      std::bind(&FilterEngine::UpdateAvailable, this, callback,
+                std::placeholders::_1));
 }
 
 void FilterEngine::RemoveUpdateAvailableCallback()
 {
   jsEngine->RemoveEventCallback("updateAvailable");
 }
 
 void FilterEngine::UpdateAvailable(
     FilterEngine::UpdateAvailableCallback callback, JsValueList& params)
 {
   if (params.size() >= 1 && !params[0]->IsNull())
     callback(params[0]->AsString());
 }
 
 void FilterEngine::ForceUpdateCheck(
     FilterEngine::UpdateCheckDoneCallback callback)
 {
   std::string eventName = "_updateCheckDone";
   eventName += ++updateCheckId;
 
-  jsEngine->SetEventCallback(eventName, std::tr1::bind(&FilterEngine::UpdateCheckDone,
-      this, eventName, callback, std::tr1::placeholders::_1));
+  jsEngine->SetEventCallback(eventName, std::bind(&FilterEngine::UpdateCheckDone,
+      this, eventName, callback, std::placeholders::_1));
 
   JsValuePtr func = jsEngine->Evaluate("API.forceUpdateCheck");
   JsValueList params;
   params.push_back(jsEngine->NewValue(eventName));
   func->Call(params);
 }
 
 void FilterEngine::UpdateCheckDone(const std::string& eventName,
     FilterEngine::UpdateCheckDoneCallback callback, JsValueList& params)
 {
   jsEngine->RemoveEventCallback(eventName);
 
   std::string error(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
   callback(error);
 }
 
 void FilterEngine::SetFilterChangeCallback(FilterEngine::FilterChangeCallback callback)
 {
-  jsEngine->SetEventCallback("filterChange", std::tr1::bind(&FilterEngine::FilterChanged,
-      this, callback, std::tr1::placeholders::_1));
+  jsEngine->SetEventCallback("filterChange", std::bind(&FilterEngine::FilterChanged,
+      this, callback, std::placeholders::_1));
 }
 
 void FilterEngine::RemoveFilterChangeCallback()
 {
   jsEngine->RemoveEventCallback("filterChange");
 }
 
 void FilterEngine::FilterChanged(FilterEngine::FilterChangeCallback callback, JsValueList& params)
 {
   std::string action(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
   JsValuePtr item(params.size() >= 2 ? params[1] : jsEngine->NewValue(false));
   callback(action, item);
 }
 
 void FilterEngine::ShowNotification(const ShowNotificationCallback& callback,
                                          const JsValueList& params)
 {
   if (params.size() < 1)
     return;
 
-  callback(Notification::JsValueToNotification(std::move(*params[0])));
+  if (!params[0]->IsObject())
+  {
+    return;
+  }
+  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();
 }
+
+FilterPtr FilterEngine::GetWhitelistingFilter(const std::string& url,
+  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,
+  ContentTypeMask contentTypeMask,
+  const std::vector<std::string>& documentUrls) const
+{
+  if (documentUrls.empty())
+  {
+    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, contentTypeMask, parentUrl);
+    if (filter)
+    {
+      return filter;
+    }
+    currentUrl = parentUrl;
+  }
+  while (urlIterator != documentUrls.end());
+  return FilterPtr();
+}