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: Check platform and platform version for user stylesheet support Created April 20, 2017, 12:42 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
« no previous file with comments | « no previous file | ext/background.js » ('j') | lib/css.js » ('J')
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 {userStylesheetsSupported, 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
27 port.on("get-selectors", (msg, sender) => 28 port.on("get-selectors", (msg, sender) =>
28 { 29 {
29 let selectors; 30 let selectors;
30 let trace = devtools && devtools.hasPanel(sender.page); 31 let trace = devtools && devtools.hasPanel(sender.page);
31 32
32 if (!checkWhitelisted(sender.page, sender.frame, 33 if (!checkWhitelisted(sender.page, sender.frame,
33 RegExpFilter.typeMap.DOCUMENT | 34 RegExpFilter.typeMap.DOCUMENT |
34 RegExpFilter.typeMap.ELEMHIDE)) 35 RegExpFilter.typeMap.ELEMHIDE))
35 { 36 {
36 let specificOnly = checkWhitelisted(sender.page, sender.frame, 37 let specificOnly = checkWhitelisted(sender.page, sender.frame,
37 RegExpFilter.typeMap.GENERICHIDE); 38 RegExpFilter.typeMap.GENERICHIDE);
38 selectors = ElemHide.getSelectorsForDomain( 39 selectors = ElemHide.getSelectorsForDomain(
39 extractHostFromFrame(sender.frame), 40 extractHostFromFrame(sender.frame),
40 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING 41 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING
41 ); 42 );
42 } 43 }
43 else 44 else
44 { 45 {
45 selectors = []; 46 selectors = [];
46 } 47 }
47 48
48 return {selectors, trace}; 49 if (!userStylesheetsSupported)
50 return {selectors, trace, inject: true};
51
52 return new Promise(resolve =>
53 {
54 hideElements(sender.page.id, sender.frame.id, selectors, error =>
55 {
56 let response = {trace, inject: !!error};
57
58 if (trace || error)
59 response.selectors = selectors;
60
61 resolve(response);
62 });
63 });
64 });
65
66 port.on("hide-elements", (msg, sender) =>
67 {
68 return new Promise(resolve =>
69 {
70 hideElements(sender.page.id, sender.frame.id, msg.selectors, error =>
71 {
72 resolve({success: !error});
73 });
74 });
49 }); 75 });
50 76
51 port.on("forward", (msg, sender) => 77 port.on("forward", (msg, sender) =>
52 { 78 {
53 let targetPage; 79 let targetPage;
54 if (msg.targetPageId) 80 if (msg.targetPageId)
55 targetPage = ext.getPage(msg.targetPageId); 81 targetPage = ext.getPage(msg.targetPageId);
56 else 82 else
57 targetPage = sender.page; 83 targetPage = sender.page;
58 84
59 if (targetPage) 85 if (targetPage)
60 { 86 {
61 msg.payload.sender = sender.page.id; 87 msg.payload.sender = sender.page.id;
62 if (msg.expectsResponse) 88 if (msg.expectsResponse)
63 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload)); 89 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload));
64 targetPage.sendMessage(msg.payload); 90 targetPage.sendMessage(msg.payload);
65 } 91 }
66 }); 92 });
OLDNEW
« no previous file with comments | « no previous file | ext/background.js » ('j') | lib/css.js » ('J')

Powered by Google App Engine
This is Rietveld