lib/whitelisting.js - Issue 29321504: Issue 2738 - Pass bit masks to matching functions

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: lib/whitelisting.js

Issue 29321504: Issue 2738 - Pass bit masks to matching functions (Closed)

Patch Set: Created July 9, 2015, 2:50 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: lib/whitelisting.js

diff --git a/lib/whitelisting.js b/lib/whitelisting.js

index 129e775847c2229e272be68113210d439ef32fb4..3bf6a70a3af79812cb2daba95363d89aadcc7f3b 100644

--- a/lib/whitelisting.js

+++ b/lib/whitelisting.js

@@ -18,6 +18,7 @@

/** @module whitelisting */

let {defaultMatcher} = require("matcher");

+let {RegExpFilter} = require("filterClasses");

let {stringifyURL, getDecodedHostname, extractHostFromFrame, isThirdParty} = require("url");

let pagesWithKey = new ext.PageMap();

@@ -33,7 +34,7 @@ exports.isPageWhitelisted = function(page)

let url = page.url;

return defaultMatcher.whitelist.matchesAny(

- stringifyURL(url), "DOCUMENT",

+ stringifyURL(url), RegExpFilter.toTypeMask("DOCUMENT"),

getDecodedHostname(url), false, null

);

};

@@ -56,7 +57,7 @@ exports.isFrameWhitelisted = function(page, frame, type)

let documentHost = extractHostFromFrame(parent) || getDecodedHostname(url);

let filter = defaultMatcher.whitelist.matchesAny(

- stringifyURL(url), type || "DOCUMENT",

+ stringifyURL(url), RegExpFilter.toTypeMask(type || "DOCUMENT"),

Sebastian Noack 2015/07/09 15:28:52 And here as well.

kzar 2015/07/12 14:28:01 Done.

documentHost, isThirdParty(url, documentHost),

getKey(page, frame)

);