Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: src/plugin/PluginFilter.h

Issue 5316782940225536: Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later. (Closed)
Left Patch Set: fix accoring to comments Created Jan. 13, 2015, 12:59 p.m.
Right Patch Set: rebase and remove member of CFilter Created Feb. 4, 2015, 12:50 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « src/plugin/AdblockPlusDomTraverser.cpp ('k') | src/plugin/PluginFilter.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH
4 *
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
7 * published by the Free Software Foundation.
8 *
9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */
17
1 #ifndef _PLUGIN_FILTER_H_ 18 #ifndef _PLUGIN_FILTER_H_
2 #define _PLUGIN_FILTER_H_ 19 #define _PLUGIN_FILTER_H_
3 20
4 21
5 #include "PluginTypedef.h" 22 #include "PluginTypedef.h"
6 #include <memory> 23 #include <memory>
7 #include <AdblockPlus/FilterEngine.h> 24 #include <AdblockPlus/FilterEngine.h>
8 25
9 enum CFilterElementHideAttrPos 26 enum CFilterElementHideAttrPos
10 { 27 {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 100
84 101
85 enum EFilterType 102 enum EFilterType
86 { 103 {
87 filterTypeBlocking = 0, 104 filterTypeBlocking = 0,
88 filterTypeWhiteList = 1, 105 filterTypeWhiteList = 1,
89 filterTypeElementHide = 2, 106 filterTypeElementHide = 2,
90 filterTypeUnknown = 3 107 filterTypeUnknown = 3
91 } filterType; 108 } filterType;
92 109
93 AdblockPlus::FilterEngine::ContentType m_contentType;
94 enum EFilterType m_filterType; 110 enum EFilterType m_filterType;
95 bool m_isMatchCase; 111 bool m_isMatchCase;
96 bool m_isFirstParty; 112 bool m_isFirstParty;
97 bool m_isThirdParty; 113 bool m_isThirdParty;
98 bool m_isFromStart; 114 bool m_isFromStart;
99 bool m_isFromEnd; 115 bool m_isFromEnd;
100 int m_hitCount; 116 int m_hitCount;
101 CString m_filterText; 117 CString m_filterText;
102 118
103 CFilter(const CFilter&); 119 CFilter(const CFilter&);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::ws tring& domain, const std::wstring& indent) const; 162 bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::ws tring& domain, const std::wstring& indent) const;
147 163
148 164
149 bool ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentTy pe contentType, const std::wstring& domain, bool addDebug=false) const; 165 bool ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentTy pe contentType, const std::wstring& domain, bool addDebug=false) const;
150 166
151 HANDLE hideFiltersLoadedEvent; 167 HANDLE hideFiltersLoadedEvent;
152 }; 168 };
153 169
154 170
155 #endif // _PLUGIN_FILTER_H_ 171 #endif // _PLUGIN_FILTER_H_
LEFTRIGHT

Powered by Google App Engine
This is Rietveld