Delta Between Two Patch Sets: popupBlocker.js
Issue 6346177440120832:
Added abstraction for frames, to fix domain-based rules, whitelisting and ad counter on Safari (Closed)
Left Patch Set:
Created Dec. 21, 2013, 7:48 p.m.
Right Patch Set: Addressed another comment
Created Jan. 20, 2014, 8:50 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« popup.js ('k')
|
safari/ext/background.js » ('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 <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2013 Eyeo GmbH | 3 * Copyright (C) 2006-2013 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 56 | 56 |
| 57 function checkPotentialPopup(tabId, url, opener) | 57 function checkPotentialPopup(tabId, url, opener) |
| 58 { | 58 { |
| 59 var requestHost = extractHostFromURL(url); | 59 var requestHost = extractHostFromURL(url); |
| 60 var documentHost = extractHostFromURL(opener); | 60 var documentHost = extractHostFromURL(opener); |
| 61 var thirdParty = isThirdParty(requestHost, documentHost); | 61 var thirdParty = isThirdParty(requestHost, documentHost); |
| 62 var filter = defaultMatcher.matchesAny(url || "about:blank", "POPUP", document Host, thirdParty); | 62 var filter = defaultMatcher.matchesAny(url || "about:blank", "POPUP", document Host, thirdParty); |
| 63 if (filter instanceof BlockingFilter) | 63 if (filter instanceof BlockingFilter) |
| 64 chrome.tabs.remove(tabId); | 64 chrome.tabs.remove(tabId); |
| 65 } | 65 } |
| LEFT | RIGHT |
« popup.js ('k')
|
safari/ext/background.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
