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 239 matching lines @@
 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)));
   return result;
 }
 
-NotificationPtr FilterEngine::GetNextNotificationToShow(const std::string& url)
+void FilterEngine::ShowNextNotification(const std::string& url)
 {
-  JsValuePtr func = jsEngine->Evaluate("API.getNextNotificationToShow");
+  JsValuePtr func = jsEngine->Evaluate("API.showNextNotification");
   JsValueList params;
   if (!url.empty())
   {
     params.push_back(jsEngine->NewValue(url));
   }
-  return Notification::JsValueToNotification(func->Call(params));
+  func->Call(params);
+}
+
+void FilterEngine::SetNotificationAvailableCallback(const NotificationAvailableCallback& value)
+{
+  if (!value)
+    return;
+
+  jsEngine->SetEventCallback("_notificationAvailable",
+    std::tr1::bind(&FilterEngine::NotificationAvailable, this, value,
+                   std::tr1::placeholders::_1));
+}
+
+void FilterEngine::RemoveNotificationAvailableCallback()
+{
+  jsEngine->RemoveEventCallback("_notificationAvailable");
 }
 
 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 128 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,
+                                         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();
 }