src/plugin/AdblockPlusClient.h - Issue 5316782940225536: Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later.

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 5316782940225536: Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later. (Closed)

Patch Set: remove debugging code Created Nov. 24, 2014, 11:09 a.m.

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

Jump to:

Index: src/plugin/AdblockPlusClient.h

===================================================================

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

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

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

#include "PluginClientBase.h"

#include "../shared/Communication.h"

#include "../shared/CriticalSection.h"

+#include <AdblockPlus/FilterEngine.h>

class CPluginFilter;

@@ -49,7 +50,7 @@

// Removes the url from the list of whitelisted urls if present

// Only called from ui thread

- bool ShouldBlock(const std::wstring& src, int contentType, const std::wstring& domain, bool addDebug=false);

+ 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);

@@ -57,7 +58,7 @@

int GetIEVersion();

- bool Matches(const std::wstring& url, const std::wstring& contentType, const std::wstring& domain);

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

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

std::vector<SubscriptionDescription> FetchAvailableSubscriptions();

std::vector<SubscriptionDescription> GetListedSubscriptions();