| 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-present eyeo GmbH | 3 * Copyright (C) 2006-present 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 #include <algorithm> | 18 #include <algorithm> |
| 19 #include <cctype> | 19 #include <cctype> |
| 20 #include <functional> | 20 #include <functional> |
| 21 #include <string> | 21 #include <string> |
| 22 #include <cassert> | 22 #include <cassert> |
| 23 #include <thread> | |
| 24 | 23 |
| 25 #include <AdblockPlus.h> | 24 #include <AdblockPlus.h> |
| 26 #include "JsContext.h" | 25 #include "JsContext.h" |
| 27 #include "Thread.h" | |
| 28 #include <mutex> | 26 #include <mutex> |
| 29 #include <condition_variable> | 27 #include <condition_variable> |
| 30 | 28 |
| 31 using namespace AdblockPlus; | 29 using namespace AdblockPlus; |
| 32 | 30 |
| 33 extern std::string jsSources[]; | 31 extern std::string jsSources[]; |
| 34 | 32 |
| 35 Filter::Filter(JsValue&& value) | 33 Filter::Filter(JsValue&& value) |
| 36 : JsValue(std::move(value)) | 34 : JsValue(std::move(value)) |
| 37 { | 35 { |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 595 FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parent
Url); | 593 FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parent
Url); |
| 596 if (filter) | 594 if (filter) |
| 597 { | 595 { |
| 598 return filter; | 596 return filter; |
| 599 } | 597 } |
| 600 currentUrl = parentUrl; | 598 currentUrl = parentUrl; |
| 601 } | 599 } |
| 602 while (urlIterator != documentUrls.end()); | 600 while (urlIterator != documentUrls.end()); |
| 603 return FilterPtr(); | 601 return FilterPtr(); |
| 604 } | 602 } |
| OLD | NEW |