| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-2017 eyeo GmbH | 3  * Copyright (C) 2006-2017 eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 30 { | 30 { | 
| 31   class FilterEngine; | 31   class FilterEngine; | 
| 32   typedef std::shared_ptr<FilterEngine> FilterEnginePtr; | 32   typedef std::shared_ptr<FilterEngine> FilterEnginePtr; | 
| 33 | 33 | 
| 34   /** | 34   /** | 
| 35    * Wrapper for an Adblock Plus filter object. | 35    * Wrapper for an Adblock Plus filter object. | 
| 36    * There are no accessors for most | 36    * There are no accessors for most | 
| 37    * [filter properties](https://adblockplus.org/jsdoc/adblockpluscore/Filter.ht
     ml), | 37    * [filter properties](https://adblockplus.org/jsdoc/adblockpluscore/Filter.ht
     ml), | 
| 38    * use `GetProperty()` to retrieve them by name. | 38    * use `GetProperty()` to retrieve them by name. | 
| 39    */ | 39    */ | 
| 40   class Filter : public JsValue, | 40   class Filter : public JsValue | 
| 41                  public std::enable_shared_from_this<Filter> |  | 
| 42   { | 41   { | 
| 43   public: | 42   public: | 
| 44     /** | 43     /** | 
| 45      * Filter types, see https://adblockplus.org/en/filters. | 44      * Filter types, see https://adblockplus.org/en/filters. | 
| 46      */ | 45      */ | 
| 47     enum Type {TYPE_BLOCKING, TYPE_EXCEPTION, | 46     enum Type {TYPE_BLOCKING, TYPE_EXCEPTION, | 
| 48                TYPE_ELEMHIDE, TYPE_ELEMHIDE_EXCEPTION, | 47                TYPE_ELEMHIDE, TYPE_ELEMHIDE_EXCEPTION, | 
| 49                TYPE_COMMENT, TYPE_INVALID}; | 48                TYPE_COMMENT, TYPE_INVALID}; | 
| 50 | 49 | 
| 51     /** | 50     /** | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
| 80      */ | 79      */ | 
| 81     Filter(JsValue&& value); | 80     Filter(JsValue&& value); | 
| 82   }; | 81   }; | 
| 83 | 82 | 
| 84   /** | 83   /** | 
| 85    * Wrapper for a subscription object. | 84    * Wrapper for a subscription object. | 
| 86    * There are no accessors for most | 85    * There are no accessors for most | 
| 87    * [subscription properties](https://adblockplus.org/jsdoc/adblockpluscore/Sub
     scription.html), | 86    * [subscription properties](https://adblockplus.org/jsdoc/adblockpluscore/Sub
     scription.html), | 
| 88    * use `GetProperty()` to retrieve them by name. | 87    * use `GetProperty()` to retrieve them by name. | 
| 89    */ | 88    */ | 
| 90   class Subscription : public JsValue, | 89   class Subscription : public JsValue | 
| 91                        public std::enable_shared_from_this<Subscription> |  | 
| 92   { | 90   { | 
| 93   public: | 91   public: | 
| 94     /** | 92     /** | 
| 95      * Checks if this subscription has been added to the list of subscriptions. | 93      * Checks if this subscription has been added to the list of subscriptions. | 
| 96      * @return `true` if this subscription has been added. | 94      * @return `true` if this subscription has been added. | 
| 97      */ | 95      */ | 
| 98     bool IsListed() const; | 96     bool IsListed() const; | 
| 99 | 97 | 
| 100     /** | 98     /** | 
| 101      * Adds this subscription to the list of subscriptions. | 99      * Adds this subscription to the list of subscriptions. | 
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 542       const JsValueList& param) const; | 540       const JsValueList& param) const; | 
| 543     FilterPtr GetWhitelistingFilter(const std::string& url, | 541     FilterPtr GetWhitelistingFilter(const std::string& url, | 
| 544       ContentTypeMask contentTypeMask, const std::string& documentUrl) const; | 542       ContentTypeMask contentTypeMask, const std::string& documentUrl) const; | 
| 545     FilterPtr GetWhitelistingFilter(const std::string& url, | 543     FilterPtr GetWhitelistingFilter(const std::string& url, | 
| 546       ContentTypeMask contentTypeMask, | 544       ContentTypeMask contentTypeMask, | 
| 547       const std::vector<std::string>& documentUrls) const; | 545       const std::vector<std::string>& documentUrls) const; | 
| 548   }; | 546   }; | 
| 549 } | 547 } | 
| 550 | 548 | 
| 551 #endif | 549 #endif | 
| OLD | NEW | 
|---|