Delta Between Two Patch Sets: src/FilterEngine.cpp
Issue 29396582:
Issue 5039 - add support of nullable non-object values in settings
Left Patch Set: add proper support of nullable setting values
Created March 28, 2017, 2:28 p.m.
Right Patch Set: rebase
Created March 29, 2017, 4:39 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« lib/prefs.js ('k')
|
src/JsEngine.cpp » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 553 FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parent Url); | 553 FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parent Url); |
| 554 if (filter) | 554 if (filter) |
| 555 { | 555 { |
| 556 return filter; | 556 return filter; |
| 557 } | 557 } |
| 558 currentUrl = parentUrl; | 558 currentUrl = parentUrl; |
| 559 } | 559 } |
| 560 while (urlIterator != documentUrls.end()); | 560 while (urlIterator != documentUrls.end()); |
| 561 return FilterPtr(); | 561 return FilterPtr(); |
| 562 } | 562 } |
| LEFT | RIGHT |
« lib/prefs.js ('k')
|
src/JsEngine.cpp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
