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

Side by Side Diff: lib/popupBlocker.js

Issue 29739594: Issue 6543 - Match requests without tabId/frameId in their originating context (Closed)
Patch Set: Created April 2, 2018, 2:55 a.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-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
(...skipping 30 matching lines...) Expand all
41 } 41 }
42 42
43 function checkPotentialPopup(tabId, popup) 43 function checkPotentialPopup(tabId, popup)
44 { 44 {
45 let urlObj = new URL(popup.url || "about:blank"); 45 let urlObj = new URL(popup.url || "about:blank");
46 let urlString = stringifyURL(urlObj); 46 let urlString = stringifyURL(urlObj);
47 let documentHost = extractHostFromFrame(popup.sourceFrame); 47 let documentHost = extractHostFromFrame(popup.sourceFrame);
48 let thirdParty = isThirdParty(urlObj, documentHost); 48 let thirdParty = isThirdParty(urlObj, documentHost);
49 49
50 let specificOnly = !!checkWhitelisted( 50 let specificOnly = !!checkWhitelisted(
51 popup.sourcePage, popup.sourceFrame, 51 popup.sourcePage, popup.sourceFrame, null,
52 RegExpFilter.typeMap.GENERICBLOCK 52 RegExpFilter.typeMap.GENERICBLOCK
53 ); 53 );
54 54
55 let filter = defaultMatcher.matchesAny( 55 let filter = defaultMatcher.matchesAny(
56 urlString, RegExpFilter.typeMap.POPUP, 56 urlString, RegExpFilter.typeMap.POPUP,
57 documentHost, thirdParty, null, specificOnly 57 documentHost, thirdParty, null, specificOnly
58 ); 58 );
59 59
60 if (filter instanceof BlockingFilter) 60 if (filter instanceof BlockingFilter)
61 browser.tabs.remove(tabId); 61 browser.tabs.remove(tabId);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 { 123 {
124 forgetPopup(details.tabId); 124 forgetPopup(details.tabId);
125 } 125 }
126 else 126 else
127 { 127 {
128 popup.sourceFrame = frame; 128 popup.sourceFrame = frame;
129 checkPotentialPopup(details.tabId, popup); 129 checkPotentialPopup(details.tabId, popup);
130 } 130 }
131 }); 131 });
132 } 132 }
OLDNEW
« no previous file with comments | « lib/filterComposer.js ('k') | lib/requestBlocker.js » ('j') | lib/requestBlocker.js » ('J')

Powered by Google App Engine
This is Rietveld