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

Side by Side Diff: background.js

Issue 29410607: Issue 5090 - Use user stylesheets for element hiding if possible (Closed)
Patch Set: Add comment explaining when we inject styles Created April 18, 2017, 9:20 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
« no previous file with comments | « no previous file | ext/background.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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-2017 eyeo GmbH 3 * Copyright (C) 2006-2017 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} = require("filterClasses"); 20 const {RegExpFilter} = require("filterClasses");
21 const {ElemHide} = require("elemHide"); 21 const {ElemHide} = require("elemHide");
22 const {checkWhitelisted} = require("whitelisting"); 22 const {checkWhitelisted} = require("whitelisting");
23 const {extractHostFromFrame} = require("url"); 23 const {extractHostFromFrame} = require("url");
24 const {hideElements} = require("css");
24 const {port} = require("messaging"); 25 const {port} = require("messaging");
25 const devtools = require("devtools"); 26 const devtools = require("devtools");
26 27
28 let tryInsertCSS = true;
29
27 port.on("get-selectors", (msg, sender) => 30 port.on("get-selectors", (msg, sender) =>
28 { 31 {
29 let selectors; 32 let selectors;
30 let trace = devtools && devtools.hasPanel(sender.page); 33 let trace = devtools && devtools.hasPanel(sender.page);
31 34
32 if (!checkWhitelisted(sender.page, sender.frame, 35 if (!checkWhitelisted(sender.page, sender.frame,
33 RegExpFilter.typeMap.DOCUMENT | 36 RegExpFilter.typeMap.DOCUMENT |
34 RegExpFilter.typeMap.ELEMHIDE)) 37 RegExpFilter.typeMap.ELEMHIDE))
35 { 38 {
36 let specificOnly = checkWhitelisted(sender.page, sender.frame, 39 let specificOnly = checkWhitelisted(sender.page, sender.frame,
37 RegExpFilter.typeMap.GENERICHIDE); 40 RegExpFilter.typeMap.GENERICHIDE);
38 selectors = ElemHide.getSelectorsForDomain( 41 selectors = ElemHide.getSelectorsForDomain(
39 extractHostFromFrame(sender.frame), 42 extractHostFromFrame(sender.frame),
40 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING 43 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING
41 ); 44 );
42 } 45 }
43 else 46 else
44 { 47 {
45 selectors = []; 48 selectors = [];
46 } 49 }
47 50
48 return {selectors, trace}; 51 if (!tryInsertCSS)
52 return {selectors, trace, inject: true};
53
54 return new Promise(resolve =>
55 {
56 hideElements(sender.page.id, sender.frame.id, selectors, error =>
57 {
58 if (error && /\bError processing cssOrigin\b/.test(error.message) != -1)
kzar 2017/04/20 06:17:15 From the discussion in the Chromium issue it seems
Manish Jethani 2017/04/20 12:50:32 Yeah, this makes sense. I've added a userStyleshee
kzar 2017/04/21 11:20:22 Nice, looks good. Could you update the issue descr
59 tryInsertCSS = false;
60
61 let response = {trace, inject: !!error};
62
63 if (trace || error)
64 response.selectors = selectors;
65
66 resolve(response);
67 });
68 });
69 });
70
71 port.on("hide-elements", (msg, sender) =>
72 {
73 return new Promise(resolve =>
74 {
75 hideElements(sender.page.id, sender.frame.id, msg.selectors, error =>
76 {
77 resolve({success: !error});
78 });
79 });
49 }); 80 });
50 81
51 port.on("forward", (msg, sender) => 82 port.on("forward", (msg, sender) =>
52 { 83 {
53 let targetPage; 84 let targetPage;
54 if (msg.targetPageId) 85 if (msg.targetPageId)
55 targetPage = ext.getPage(msg.targetPageId); 86 targetPage = ext.getPage(msg.targetPageId);
56 else 87 else
57 targetPage = sender.page; 88 targetPage = sender.page;
58 89
59 if (targetPage) 90 if (targetPage)
60 { 91 {
61 msg.payload.sender = sender.page.id; 92 msg.payload.sender = sender.page.id;
62 if (msg.expectsResponse) 93 if (msg.expectsResponse)
63 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload)); 94 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload));
64 targetPage.sendMessage(msg.payload); 95 targetPage.sendMessage(msg.payload);
65 } 96 }
66 }); 97 });
OLDNEW
« no previous file with comments | « no previous file | ext/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld