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

Side by Side Diff: lib/popupBlocker.js

Issue 29737602: Issue 4580 - Make filter/request logging use plain tabIds, prepare for multi-tab requests (Closed)
Patch Set: Created April 2, 2018, 12:27 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
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);
62 62
63 logRequest( 63 logRequest(
64 popup.sourcePage, urlString, "POPUP", 64 [popup.sourcePage.id], urlString, "POPUP",
65 documentHost, thirdParty, null, 65 documentHost, thirdParty, null,
66 specificOnly, filter 66 specificOnly, filter
67 ); 67 );
68 } 68 }
69 69
70 function onPopupURLChanged(details) 70 function onPopupURLChanged(details)
71 { 71 {
72 // Ignore frames inside the popup window. 72 // Ignore frames inside the popup window.
73 if (details.frameId != 0) 73 if (details.frameId != 0)
74 return; 74 return;
(...skipping 48 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

Powered by Google App Engine
This is Rietveld