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

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

Patch Set: update Created Jan. 13, 2015, 3:20 p.m.

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

Jump to:

Index: src/plugin/AdblockPlusClient.cpp

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

index 922f3451e6979f4e60d3fdc6d4df02762465d28c..fd2d2da8a42c3c9d285959d7981bc884a3fe8621 100644

--- a/src/plugin/AdblockPlusClient.cpp

+++ b/src/plugin/AdblockPlusClient.cpp

@@ -256,11 +256,11 @@ bool CAdblockPlusClient::IsElementHidden(const std::wstring& tag, IHTMLElement*

return isHidden;

}

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

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

{

DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" start").c_str());

Communication::OutputBuffer request;

- request << Communication::PROC_IS_WHITELISTED_URL << ToUtf8String(url);

+ request << Communication::PROC_IS_WHITELISTED_URL << ToUtf8String(url) << frameHierarchy;

Communication::InputBuffer response;

if (!CallEngine(request, response))

@@ -273,10 +273,10 @@ bool CAdblockPlusClient::IsWhitelistedUrl(const std::wstring& url)

return isWhitelisted;

}

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

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

{

Communication::OutputBuffer request;

- request << Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL << ToUtf8String(url);

+ request << Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL << ToUtf8String(url) << frameHierarchy;

Communication::InputBuffer response;

if (!CallEngine(request, response))