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

Side by Side Diff: src/plugin/AdblockPlusDomTraverser.cpp

Issue 29331767: Issue #1234 + Clean up - CPluginTab (dead code, nullptr defect fix, etc.) (Closed)
Patch Set: rebase only Created Dec. 15, 2015, 4:39 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
« no previous file with comments | « no previous file | src/plugin/PluginClass.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 bool CPluginDomTraverser::OnElement(IHTMLElement* pEl, const std::wstring& tag, CPluginDomTraverserCache* cache, bool isDebug, const std::wstring& indent) 47 bool CPluginDomTraverser::OnElement(IHTMLElement* pEl, const std::wstring& tag, CPluginDomTraverserCache* cache, bool isDebug, const std::wstring& indent)
48 { 48 {
49 if (cache->m_isHidden) 49 if (cache->m_isHidden)
50 { 50 {
51 return false; 51 return false;
52 } 52 }
53 53
54 // Check if element is hidden 54 // Check if element is hidden
55 CPluginClient* client = CPluginClient::GetInstance(); 55 CPluginClient* client = CPluginClient::GetInstance();
56 56
57 cache->m_isHidden = client->IsElementHidden(tag, pEl, m_domain, indent, m_tab- >m_filter.get()); 57 cache->m_isHidden = client->IsElementHidden(tag, pEl, m_domain, indent, &(m_ta b->m_filter));
58 if (cache->m_isHidden) 58 if (cache->m_isHidden)
59 { 59 {
60 HideElement(pEl, tag, L"", false, indent); 60 HideElement(pEl, tag, L"", false, indent);
61 return false; 61 return false;
62 } 62 }
63 63
64 // Images 64 // Images
65 if (tag == L"img") 65 if (tag == L"img")
66 { 66 {
67 CComVariant vAttr; 67 CComVariant vAttr;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 #ifdef ENABLE_DEBUG_RESULT 152 #ifdef ENABLE_DEBUG_RESULT
153 if (isDebug) 153 if (isDebug)
154 { 154 {
155 CPluginDebug::DebugResultHiding(type, url, L"-"); 155 CPluginDebug::DebugResultHiding(type, url, L"-");
156 } 156 }
157 #endif // ENABLE_DEBUG_RESULT 157 #endif // ENABLE_DEBUG_RESULT
158 } 158 }
159 } 159 }
160 } 160 }
OLDNEW
« no previous file with comments | « no previous file | src/plugin/PluginClass.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld