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

Side by Side Diff

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

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

Side by Side Diff: src/plugin/AdblockPlusClient.h

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

Patch Set: address comments Created Nov. 17, 2015, 8:14 p.m.

Left:
Right:

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

Jump to:

View unified diff | Download patch

« src/engine/Main.cpp ('K') | « src/engine/Main.cpp ('k') | src/plugin/AdblockPlusClient.cpp » ('j') | src/plugin/PluginTabBase.cpp » ('J')

OLD	NEW
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-2015 Eyeo GmbH	3 * Copyright (C) 2006-2015 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

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61	61

62 ~CAdblockPlusClient();	62 ~CAdblockPlusClient();

63	63

64 static CAdblockPlusClient* GetInstance();	64 static CAdblockPlusClient* GetInstance();

65	65

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

67 // Only called from ui thread	67 // Only called from ui thread

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

69	69

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

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

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

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

74	74

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

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

77 std::vector<SubscriptionDescription> FetchAvailableSubscriptions();	77 std::vector<SubscriptionDescription> FetchAvailableSubscriptions();

78 std::vector<SubscriptionDescription> GetListedSubscriptions();	78 std::vector<SubscriptionDescription> GetListedSubscriptions();

79 bool IsAcceptableAdsEnabled();	79 bool IsAcceptableAdsEnabled();

80 void SetSubscription(const std::wstring& url);	80 void SetSubscription(const std::wstring& url);

81 void AddSubscription(const std::wstring& url);	81 void AddSubscription(const std::wstring& url);

82 void RemoveSubscription(const std::wstring& url);	82 void RemoveSubscription(const std::wstring& url);

83 void UpdateAllSubscriptions();	83 void UpdateAllSubscriptions();

(...skipping 14 matching lines...) Expand all Loading...
98 bool TogglePluginEnabled();	98 bool TogglePluginEnabled();

99 std::wstring GetHostFromUrl(const std::wstring& url);	99 std::wstring GetHostFromUrl(const std::wstring& url);

100 int CompareVersions(const std::wstring& v1, const std::wstring& v2);	100 int CompareVersions(const std::wstring& v1, const std::wstring& v2);

101	101

102 bool IsFirstRun();	102 bool IsFirstRun();

103 };	103 };

104	104

105 typedef CAdblockPlusClient CPluginClient;	105 typedef CAdblockPlusClient CPluginClient;

106	106

107 #endif // _ADBLOCK_PLUS_CLIENT_H_	107 #endif // _ADBLOCK_PLUS_CLIENT_H_

OLD	NEW