| 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 21 matching lines...) Expand all  Loading... | 
| 32   enum Type | 32   enum Type | 
| 33   { | 33   { | 
| 34     UNKNOWN = 0, | 34     UNKNOWN = 0, | 
| 35     INVALID = 1, | 35     INVALID = 1, | 
| 36     COMMENT = 2, | 36     COMMENT = 2, | 
| 37     BLOCKING = 3, | 37     BLOCKING = 3, | 
| 38     WHITELIST = 4, | 38     WHITELIST = 4, | 
| 39     ELEMHIDE = 5, | 39     ELEMHIDE = 5, | 
| 40     ELEMHIDEEXCEPTION = 6, | 40     ELEMHIDEEXCEPTION = 6, | 
| 41     ELEMHIDEEMULATION = 7, | 41     ELEMHIDEEMULATION = 7, | 
|  | 42     MAXTYPE = 7 | 
| 42   }; | 43   }; | 
| 43 | 44 | 
| 44   explicit Filter(Type type, const String& text); | 45   explicit Filter(Type type, const String& text); | 
| 45   ~Filter(); | 46   ~Filter(); | 
| 46 | 47 | 
| 47   Type mType; | 48   Type mType; | 
| 48 | 49 | 
| 49   /* TODO | 50   /* TODO | 
| 50   std::vector<Subscription> mSubscriptions; | 51   std::vector<Subscription> mSubscriptions; | 
| 51   */ | 52   */ | 
| 52 | 53 | 
| 53   EMSCRIPTEN_KEEPALIVE const String& GetText() const | 54   EMSCRIPTEN_KEEPALIVE const String& GetText() const | 
| 54   { | 55   { | 
| 55     return mText; | 56     return mText; | 
| 56   } | 57   } | 
| 57 | 58 | 
| 58   EMSCRIPTEN_KEEPALIVE OwnedString Serialize() const; | 59   EMSCRIPTEN_KEEPALIVE OwnedString Serialize() const; | 
| 59 | 60 | 
| 60   static EMSCRIPTEN_KEEPALIVE Filter* FromText(DependentString& text); | 61   static EMSCRIPTEN_KEEPALIVE Filter* FromText(DependentString& text); | 
| 61 }; | 62 }; | 
| 62 | 63 | 
| 63 typedef intrusive_ptr<Filter> FilterPtr; | 64 typedef intrusive_ptr<Filter> FilterPtr; | 
| OLD | NEW | 
|---|