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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 void FilterEngine::ShowNotification(const ShowNotificationCallback& callback, | 547 void FilterEngine::ShowNotification(const ShowNotificationCallback& callback, |
548 const JsValueList& params) const | 548 const JsValueList& params) const |
549 { | 549 { |
550 if (params.size() < 1) | 550 if (params.size() < 1) |
551 return; | 551 return; |
552 | 552 |
553 if (!params[0].IsObject()) | 553 if (!params[0].IsObject()) |
554 { | 554 { |
555 return; | 555 return; |
556 } | 556 } |
557 callback(NotificationPtr(new Notification(JsValue(params[0])))); | 557 auto notification = Notification(JsValue(params[0])); |
| 558 callback(notification); |
558 } | 559 } |
559 | 560 |
560 | 561 |
561 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2)
const | 562 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2)
const |
562 { | 563 { |
563 JsValueList params; | 564 JsValueList params; |
564 params.push_back(jsEngine->NewValue(v1)); | 565 params.push_back(jsEngine->NewValue(v1)); |
565 params.push_back(jsEngine->NewValue(v2)); | 566 params.push_back(jsEngine->NewValue(v2)); |
566 JsValue func = jsEngine->Evaluate("API.compareVersions"); | 567 JsValue func = jsEngine->Evaluate("API.compareVersions"); |
567 return func.Call(params).AsInt(); | 568 return func.Call(params).AsInt(); |
(...skipping 27 matching lines...) Expand all Loading... |
595 FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parent
Url); | 596 FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parent
Url); |
596 if (filter) | 597 if (filter) |
597 { | 598 { |
598 return filter; | 599 return filter; |
599 } | 600 } |
600 currentUrl = parentUrl; | 601 currentUrl = parentUrl; |
601 } | 602 } |
602 while (urlIterator != documentUrls.end()); | 603 while (urlIterator != documentUrls.end()); |
603 return FilterPtr(); | 604 return FilterPtr(); |
604 } | 605 } |
OLD | NEW |