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: Created Dec. 2, 2015, 6:35 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 bool CPluginDomTraverser::OnElement(IHTMLElement* pEl, const CString& tag, CPlug inDomTraverserCache* cache, bool isDebug, CString& indent) 46 bool CPluginDomTraverser::OnElement(IHTMLElement* pEl, const CString& tag, CPlug inDomTraverserCache* cache, bool isDebug, CString& indent)
47 { 47 {
48 if (cache->m_isHidden) 48 if (cache->m_isHidden)
49 { 49 {
50 return false; 50 return false;
51 } 51 }
52 52
53 // Check if element is hidden 53 // Check if element is hidden
54 CPluginClient* client = CPluginClient::GetInstance(); 54 CPluginClient* client = CPluginClient::GetInstance();
55 55
56 cache->m_isHidden = client->IsElementHidden(ToWstring(tag), pEl, m_domain, ToW string(indent), m_tab->m_filter.get()); 56 cache->m_isHidden = client->IsElementHidden(ToWstring(tag), pEl, m_domain, ToW string(indent), &(m_tab->m_filter));
57 if (cache->m_isHidden) 57 if (cache->m_isHidden)
58 { 58 {
59 HideElement(pEl, tag, L"", false, indent); 59 HideElement(pEl, tag, L"", false, indent);
60 return false; 60 return false;
61 } 61 }
62 62
63 // Images 63 // Images
64 if (tag == "img") 64 if (tag == "img")
65 { 65 {
66 CComVariant vAttr; 66 CComVariant vAttr;
(...skipping 84 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(ToWstring(type), url, L"-"); 155 CPluginDebug::DebugResultHiding(ToWstring(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