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

Delta Between Two Patch Sets: lib/devtools.js

Issue 29739603: Issue 6544 - Prevent requests sent by Chrome or Adblock Plus from being blocked (Closed)
Left Patch Set: Introduced ignoredOrigins Set Created April 5, 2018, 5:41 p.m.
Right Patch Set: Made logic more verbose Created April 9, 2018, 9:33 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | lib/requestBlocker.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 "use strict"; 18 "use strict";
19 19
20 const {RegExpFilter, 20 const {RegExpFilter,
21 WhitelistFilter, 21 WhitelistFilter,
22 ElemHideFilter} = require("filterClasses"); 22 ElemHideFilter} = require("../adblockpluscore/lib/filterClasses");
23 const {SpecialSubscription} = require("subscriptionClasses"); 23 const {SpecialSubscription} =
24 const {FilterStorage} = require("filterStorage"); 24 require("../adblockpluscore/lib/subscriptionClasses");
25 const {defaultMatcher} = require("matcher"); 25 const {FilterStorage} = require("../adblockpluscore/lib/filterStorage");
26 const {FilterNotifier} = require("filterNotifier"); 26 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
27 const {extractHostFromFrame} = require("url"); 27 const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
28 const {port} = require("messaging"); 28 const {extractHostFromFrame} = require("./url");
29 const {port} = require("./messaging");
29 30
30 const nonRequestTypes = ["DOCUMENT", "ELEMHIDE", 31 const nonRequestTypes = ["DOCUMENT", "ELEMHIDE",
31 "GENERICBLOCK", "GENERICHIDE", "CSP"]; 32 "GENERICBLOCK", "GENERICHIDE", "CSP"];
32 33
33 let panels = new Map(); 34 let panels = new Map();
34 35
35 function isActivePanel(panel) 36 function isActivePanel(panel)
36 { 37 {
37 return panel && !panel.reload && !panel.reloading; 38 return panel && !panel.reload && !panel.reloading;
38 } 39 }
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 panels.set(inspectedTabId, {port: newPort, records: []}); 377 panels.set(inspectedTabId, {port: newPort, records: []});
377 }); 378 });
378 379
379 port.on("devtools.traceElemHide", (message, sender) => 380 port.on("devtools.traceElemHide", (message, sender) =>
380 { 381 {
381 logHiddenElements( 382 logHiddenElements(
382 sender.page.id, message.selectors, message.filters, 383 sender.page.id, message.selectors, message.filters,
383 extractHostFromFrame(sender.frame) 384 extractHostFromFrame(sender.frame)
384 ); 385 );
385 }); 386 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld