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: add hg subrepo file
Created Jan. 28, 2015, 1:36 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.
« 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') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 100 | 100 |
| 101 | 101 |
| 102 enum EFilterType | 102 enum EFilterType |
| 103 { | 103 { |
| 104 filterTypeBlocking = 0, | 104 filterTypeBlocking = 0, |
| 105 filterTypeWhiteList = 1, | 105 filterTypeWhiteList = 1, |
| 106 filterTypeElementHide = 2, | 106 filterTypeElementHide = 2, |
| 107 filterTypeUnknown = 3 | 107 filterTypeUnknown = 3 |
| 108 } filterType; | 108 } filterType; |
| 109 | 109 |
| 110 AdblockPlus::FilterEngine::ContentType m_contentType; | |
| 111 enum EFilterType m_filterType; | 110 enum EFilterType m_filterType; |
| 112 bool m_isMatchCase; | 111 bool m_isMatchCase; |
| 113 bool m_isFirstParty; | 112 bool m_isFirstParty; |
| 114 bool m_isThirdParty; | 113 bool m_isThirdParty; |
| 115 bool m_isFromStart; | 114 bool m_isFromStart; |
| 116 bool m_isFromEnd; | 115 bool m_isFromEnd; |
| 117 int m_hitCount; | 116 int m_hitCount; |
| 118 CString m_filterText; | 117 CString m_filterText; |
| 119 | 118 |
| 120 CFilter(const CFilter&); | 119 CFilter(const CFilter&); |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 163 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; |
| 164 | 163 |
| 165 | 164 |
| 166 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; |
| 167 | 166 |
| 168 HANDLE hideFiltersLoadedEvent; | 167 HANDLE hideFiltersLoadedEvent; |
| 169 }; | 168 }; |
| 170 | 169 |
| 171 | 170 |
| 172 #endif // _PLUGIN_FILTER_H_ | 171 #endif // _PLUGIN_FILTER_H_ |
| LEFT | RIGHT |
« src/plugin/AdblockPlusDomTraverser.cpp ('k')
|
src/plugin/PluginFilter.cpp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
