Noissue - Upgraded to latest libadblockplus version, included v8 includes

include/AdblockPlus/FilterEngine.h

 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ADBLOCK_PLUS_FILTER_ENGINE_H
 #define ADBLOCK_PLUS_FILTER_ENGINE_H
 
 #include <functional>
 #include <map>
 #include <string>
 #include <vector>
 #include <AdblockPlus/JsEngine.h>
 #include <AdblockPlus/JsValue.h>
+#include <AdblockPlus/Notification.h>
 
 #include "tr1_memory.h"
 
 namespace AdblockPlus
 {
   class FilterEngine;
 
   /**
    * Wrapper for an Adblock Plus filter object.
+   * There are no accessors for most
+   * [filter properties](https://adblockplus.org/jsdoc/adblockplus/symbols/Filter.html),
+   * use `GetProperty()` to retrieve them by name.
    */
   class Filter : public JsValue,
                  public std::tr1::enable_shared_from_this<Filter>
   {
   public:
     /**
      * Filter types, see https://adblockplus.org/en/filters.
      */
     enum Type {TYPE_BLOCKING, TYPE_EXCEPTION,
                TYPE_ELEMHIDE, TYPE_ELEMHIDE_EXCEPTION,
@@ skipping 27 matching lines @@
      * Creates a wrapper for an existing JavaScript filter object.
      * Normally you shouldn't call this directly, but use
      * FilterEngine::GetFilter() instead.
      * @param value JavaScript filter object.
      */
     Filter(JsValuePtr value);
   };
 
   /**
    * Wrapper for a subscription object.
+   * There are no accessors for most
+   * [subscription properties](https://adblockplus.org/jsdoc/adblockplus/symbols/Subscription.html),
+   * use `GetProperty()` to retrieve them by name.
    */
   class Subscription : public JsValue,
                        public std::tr1::enable_shared_from_this<Subscription>
   {
   public:
     /**
      * Checks if this subscription has been added to the list of subscriptions.
      * @return `true` if this subscription has been added.
      */
     bool IsListed();
@@ skipping 53 matching lines @@
   public:
     // Make sure to keep ContentType in sync with FilterEngine::contentTypes
     /**
      * Possible resource content types.
      */
     enum ContentType {CONTENT_TYPE_OTHER, CONTENT_TYPE_SCRIPT,
                       CONTENT_TYPE_IMAGE, CONTENT_TYPE_STYLESHEET,
                       CONTENT_TYPE_OBJECT, CONTENT_TYPE_SUBDOCUMENT,
                       CONTENT_TYPE_DOCUMENT, CONTENT_TYPE_XMLHTTPREQUEST,
                       CONTENT_TYPE_OBJECT_SUBREQUEST, CONTENT_TYPE_FONT,
-                      CONTENT_TYPE_MEDIA};
+                      CONTENT_TYPE_MEDIA, CONTENT_TYPE_ELEMHIDE};
 
     /**
      * Callback type invoked when an update becomes available.
      * The parameter is the download URL of the update.
      */
     typedef std::tr1::function<void(const std::string&)>
         UpdateAvailableCallback;
 
     /**
      * Callback type invoked when a manually triggered update check finishes.
@@ skipping 57 matching lines @@
      */
     std::vector<SubscriptionPtr> GetListedSubscriptions() const;
 
     /**
      * Retrieves all recommended subscriptions.
      * @return List of recommended subscriptions.
      */
     std::vector<SubscriptionPtr> FetchAvailableSubscriptions() const;
 
     /**
+     * Determines which notification is to be shown next.
+     * @param url URL to match notifications to (optional).
+     * @return Notification to be shown, or `null` if there is no any.
+     */
+    NotificationPtr GetNextNotificationToShow(
+      const std::string& url = std::string());
+
+    /**
      * Checks if any active filter matches the supplied URL.
      * @param url URL to match.
      * @param contentType Content type of the requested resource.
      * @param documentUrl URL of the document requesting the resource.
      *        Note that there will be more than one document if frames are
      *        involved, see
      *        Matches(const std::string&, const std::string&, const std::vector<std::string>&) const.
      * @return Matching filter, or `null` if there was no match.
      * @throw `std::invalid_argument`, if an invalid `contentType` was supplied.
      */
@@ skipping 124 matching lines @@
                                ContentType contentType,
                                const std::string& documentUrl) const;
     void UpdateAvailable(UpdateAvailableCallback callback, JsValueList& params);
     void UpdateCheckDone(const std::string& eventName,
                          UpdateCheckDoneCallback callback, JsValueList& params);
     void FilterChanged(FilterChangeCallback callback, JsValueList& params);
   };
 }
 
 #endif