src/plugin/AdblockPlusClient.h - Issue 5447868882092032: Issue 1793 - check whether the frame is whitelisted before injecting CSS

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: src/plugin/AdblockPlusClient.h

Issue 5447868882092032: Issue 1793 - check whether the frame is whitelisted before injecting CSS (Closed)

Patch Set: rebase and address comments Created April 13, 2015, 7:31 a.m.

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

Jump to:

Index: src/plugin/AdblockPlusClient.h

diff --git a/src/plugin/AdblockPlusClient.h b/src/plugin/AdblockPlusClient.h

index 057681f6bdf2fbc2156b61d7f3a6319f484e8d35..91504a46d15eb308406b67d0a6bacd46739153df 100644

--- a/src/plugin/AdblockPlusClient.h

+++ b/src/plugin/AdblockPlusClient.h

@@ -71,9 +71,9 @@ public:

bool ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain, bool addDebug=false);

bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::wstring& domain, const std::wstring& indent, CPluginFilter* filter);

- bool IsWhitelistedUrl(const std::wstring& url);

- std::string GetWhitelistingFilter(const std::wstring& url);

- bool IsElemhideWhitelistedOnDomain(const std::wstring& url);

+ bool IsWhitelistedUrl(const std::wstring& url, const std::vector<std::string>& frameHierarchy = std::vector<std::string>());

+ std::string GetWhitelistingFilter(const std::wstring& url, const std::vector<std::string>& frameHierarchy = std::vector<std::string>());

+ bool IsElemhideWhitelistedOnDomain(const std::wstring& url, const std::vector<std::string>& frameHierarchy = std::vector<std::string>());

bool Matches(const std::wstring& url, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain);

std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain);