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

Delta Between Two Patch Sets: lib/whitelisting.js

Issue 29338638: Issue 2401 - Integrate CSS property rule handling in Firefox (Closed)
Left Patch Set: Created March 18, 2016, 3:05 p.m.
Right Patch Set: Addressed comments Created March 30, 2016, 6:41 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 | « lib/main.js ('k') | no next file » | 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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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 /** 18 /**
19 * @fileOverview This is a dummy to provide a function needed by message 19 * @fileOverview This is a dummy to provide a function needed by message
20 * responder. 20 * responder.
21 */ 21 */
22 22
23 "use strict"; 23 "use strict";
24 24
25 let {Policy} = require("contentPolicy"); 25 let {Policy} = require("contentPolicy");
26 let {RegExpFilter} = require("filterClasses"); 26 let {RegExpFilter} = require("filterClasses");
27 27
28 // NOTE: The function interface is supposed to be compatible with
29 // checkWhitelisted in adblockpluschrome. That's why there is a typeMask
30 // parameter here. However, this parameter is only used to decide whether
31 // elemhide whitelisting should be considered, so only supported values for this
32 // parameter are RegExpFilter.typeMap.DOCUMENT and
33 // RegExpFilter.typeMap.DOCUMENT | RegExpFilter.typeMap.ELEMHIDE.
28 exports.checkWhitelisted = function(page, frames, typeMask) 34 exports.checkWhitelisted = function(page, frames, typeMask)
29 { 35 {
30 let match = 36 let match =
31 Policy.isFrameWhitelisted(frames, typeMask & RegExpFilter.typeMap.ELEMHIDE ); 37 Policy.isFrameWhitelisted(frames, typeMask & RegExpFilter.typeMap.ELEMHIDE );
32 if (match) 38 if (match)
33 { 39 {
34 let [frameIndex, matchType, docDomain, thirdParty, location, filter] = match ; 40 let [frameIndex, matchType, docDomain, thirdParty, location, filter] = match ;
35 if (matchType == "DOCUMENT" || matchType == "ELEMHIDE") 41 if (matchType == "DOCUMENT" || matchType == "ELEMHIDE")
Thomas Greiner 2016/03/30 18:02:06 I noticed that this check doesn't exist in the ori
Wladimir Palant 2016/03/30 18:42:17 This function doesn't really offer the same functi
36 return filter; 42 return filter;
37 } 43 }
38 44
39 return null; 45 return null;
40 }; 46 };
LEFTRIGHT
« lib/main.js ('k') | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld