Unified Diff: Shared/AdblockPlusClient.cpp
Issue 9998007:
Initial libadblockplus integration (Closed)
Patch Set: More integration, reflecting latest libadblockplus changes
Created April 9, 2013, 5:48 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« Shared/AdblockPlusClient.h ('k')
|
Shared/AdblockPlusDomTraverser.cpp » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: Shared/AdblockPlusClient.cpp |
| =================================================================== |
| --- a/Shared/AdblockPlusClient.cpp |
| +++ b/Shared/AdblockPlusClient.cpp |
| @@ -49,11 +49,6 @@ |
| return instance; |
| } |
| -bool CAdblockPlusClient::LoadFilters() |
| -{ |
| - return m_filter->LoadHideFilters(filterEngine->GetElementHidingRules()); |
| -} |
| - |
| AdblockPlus::FilterEngine* CAdblockPlusClient::GetFilterEngine() |
| { |
| return filterEngine.get(); |
| @@ -103,12 +98,12 @@ |
| return isBlocked; |
| } |
| -bool CAdblockPlusClient::IsElementHidden(const CString& tag, IHTMLElement* pEl, const CString& domain, const CString& indent) |
| +bool CAdblockPlusClient::IsElementHidden(const CString& tag, IHTMLElement* pEl, const CString& domain, const CString& indent, CPluginFilter* filter) |
| { |
| bool isHidden; |
| m_criticalSectionFilter.Lock(); |
| { |
| - isHidden = m_filter.get() && m_filter->IsElementHidden(tag, pEl, domain, indent); |
| + isHidden = filter && filter->IsElementHidden(tag, pEl, domain, indent); |
| } |
| m_criticalSectionFilter.Unlock(); |
| return isHidden; |
« no previous file with comments
|
« Shared/AdblockPlusClient.h ('k')
|
Shared/AdblockPlusDomTraverser.cpp » ('j')
|
no next file with comments »
