| 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 |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 #pragma once | 18 #pragma once |
| 19 | 19 |
| 20 #include <type_traits> | 20 #include <type_traits> |
| 21 #include <vector> | 21 #include <vector> |
| 22 | 22 |
| 23 #include <emscripten.h> |
| 24 |
| 23 #include "../filter/Filter.h" | 25 #include "../filter/Filter.h" |
| 24 #include "../String.h" | 26 #include "../String.h" |
| 25 #include "../FilterNotifier.h" | 27 #include "../FilterNotifier.h" |
| 26 #include "../intrusive_ptr.h" | 28 #include "../intrusive_ptr.h" |
| 27 #include "../debug.h" | 29 #include "../debug.h" |
| 28 | 30 |
| 29 #define SUBSCRIPTION_PROPERTY_INTERNAL(field_type, param_type, name, topic, gett
er, setter) \ | 31 #define SUBSCRIPTION_PROPERTY_INTERNAL(field_type, param_type, name, topic, gett
er, setter) \ |
| 30 private:\ | 32 private:\ |
| 31 field_type name;\ | 33 field_type name;\ |
| 32 public:\ | 34 public:\ |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 91 |
| 90 EMSCRIPTEN_KEEPALIVE Filter* FilterAt(unsigned index); | 92 EMSCRIPTEN_KEEPALIVE Filter* FilterAt(unsigned index); |
| 91 EMSCRIPTEN_KEEPALIVE int IndexOfFilter(Filter* filter); | 93 EMSCRIPTEN_KEEPALIVE int IndexOfFilter(Filter* filter); |
| 92 EMSCRIPTEN_KEEPALIVE OwnedString Serialize() const; | 94 EMSCRIPTEN_KEEPALIVE OwnedString Serialize() const; |
| 93 EMSCRIPTEN_KEEPALIVE OwnedString SerializeFilters() const; | 95 EMSCRIPTEN_KEEPALIVE OwnedString SerializeFilters() const; |
| 94 | 96 |
| 95 static EMSCRIPTEN_KEEPALIVE Subscription* FromID(const String& id); | 97 static EMSCRIPTEN_KEEPALIVE Subscription* FromID(const String& id); |
| 96 }; | 98 }; |
| 97 | 99 |
| 98 typedef intrusive_ptr<Subscription> SubscriptionPtr; | 100 typedef intrusive_ptr<Subscription> SubscriptionPtr; |
| OLD | NEW |