Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: popupBlocker.js

Issue 29321504: Issue 2738 - Pass bit masks to matching functions (Closed)
Patch Set: Created July 9, 2015, 2:50 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank") 49 if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank")
50 delete tabsLoading[tabId]; 50 delete tabsLoading[tabId];
51 }); 51 });
52 } 52 }
53 53
54 function checkPotentialPopup(tabId, url, documentHost) 54 function checkPotentialPopup(tabId, url, documentHost)
55 { 55 {
56 url = new URL(url || "about:blank"); 56 url = new URL(url || "about:blank");
57 57
58 var filter = defaultMatcher.matchesAny( 58 var filter = defaultMatcher.matchesAny(
59 stringifyURL(url), "POPUP", 59 stringifyURL(url), RegExpFilter.toTypeMask("POPUP"),
60 documentHost, isThirdParty(url, documentHost) 60 documentHost, isThirdParty(url, documentHost)
61 ); 61 );
62 62
63 if (filter instanceof BlockingFilter) 63 if (filter instanceof BlockingFilter)
64 chrome.tabs.remove(tabId); 64 chrome.tabs.remove(tabId);
65 } 65 }
OLDNEW
« lib/whitelisting.js ('K') | « lib/whitelisting.js ('k') | webrequest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld