Issue 2693 - Update adblockplus dependency

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 116 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,
+  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);
+
+    // Set the preconfigured prefs
+    JsValuePtr preconfiguredPrefsObject = jsEngine->NewObject();
+    for (FilterEngine::Prefs::const_iterator it = preconfiguredPrefs.begin();
+         it != preconfiguredPrefs.end(); it++)
+    {
+      preconfiguredPrefsObject->SetProperty(it->first, it->second);
+    }
+    jsEngine->SetGlobalProperty("_preconfiguredPrefs", preconfiguredPrefsObject);
+    // Load adblockplus scripts
     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 37 matching lines @@
        it != contentTypes.end(); it++)
   {
     if (it->second == contentTypeUpper)
       return it->first;
   }
   throw std::invalid_argument("Cannot convert argument to ContentType");
 }
 
 void FilterEngine::InitDone(JsValueList& params)
 {
-  jsEngine->RemoveEventCallback("init");
+  jsEngine->RemoveEventCallback("_init");
   initialized = true;
   firstRun = params.size() && params[0]->AsBool();
 }
 
 bool FilterEngine::IsFirstRun() const
 {
   return firstRun;
 }
 
 FilterPtr FilterEngine::GetFilter(const std::string& text)
@@ skipping 46 matching lines @@
 {
   JsValuePtr func = jsEngine->Evaluate("API.showNextNotification");
   JsValueList params;
   if (!url.empty())
   {
     params.push_back(jsEngine->NewValue(url));
   }
   func->Call(params);
 }
 
-void FilterEngine::SetNotificationAvailableCallback(const NotificationAvailableCallback& value)
+void FilterEngine::SetShowNotificationCallback(const ShowNotificationCallback& value)
 {
   if (!value)
     return;
 
-  jsEngine->SetEventCallback("notificationAvailable",
-    std::tr1::bind(&FilterEngine::NotificationAvailable, this, value,
+  jsEngine->SetEventCallback("_showNotification",
+    std::tr1::bind(&FilterEngine::ShowNotification, this, value,
                    std::tr1::placeholders::_1));
 }
 
-void FilterEngine::RemoveNotificationAvailableCallback()
-{
-  jsEngine->RemoveEventCallback("notificationAvailable");
+void FilterEngine::RemoveShowNotificationCallback()
+{
+  jsEngine->RemoveEventCallback("_showNotification");
 }
 
 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 89 matching lines @@
 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";
+  std::string eventName = "_updateCheckDone";
   eventName += ++updateCheckId;
 
   jsEngine->SetEventCallback(eventName, std::tr1::bind(&FilterEngine::UpdateCheckDone,
       this, eventName, callback, std::tr1::placeholders::_1));
 
   JsValuePtr func = jsEngine->Evaluate("API.forceUpdateCheck");
   JsValueList params;
   params.push_back(jsEngine->NewValue(eventName));
   func->Call(params);
 }
@@ skipping 18 matching lines @@
   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::NotificationAvailable(const NotificationAvailableCallback& callback,
+void FilterEngine::ShowNotification(const ShowNotificationCallback& callback,
                                          const JsValueList& params)
 {
   if (params.size() < 1)
     return;
 
   callback(Notification::JsValueToNotification(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();
 }