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

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

Issue 5491870822039552: Issue #1234 - Remove old versions of ToWstring and ToCString (Closed)
Patch Set: Created Jan. 13, 2015, 3: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 | « src/plugin/AdblockPlusClient.cpp ('k') | 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 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 2
3 #include "PluginClient.h" 3 #include "PluginClient.h"
4 #include "PluginFilter.h" 4 #include "PluginFilter.h"
5 #include "PluginSettings.h" 5 #include "PluginSettings.h"
6 6
7 #include "AdblockPlusDomTraverser.h" 7 #include "AdblockPlusDomTraverser.h"
8 8
9 9
10 CPluginDomTraverser::CPluginDomTraverser(CPluginTab* tab) : CPluginDomTraverserB ase(tab) 10 CPluginDomTraverser::CPluginDomTraverser(CPluginTab* tab) : CPluginDomTraverserB ase(tab)
(...skipping 19 matching lines...) Expand all
30 bool CPluginDomTraverser::OnElement(IHTMLElement* pEl, const CString& tag, CPlug inDomTraverserCache* cache, bool isDebug, CString& indent) 30 bool CPluginDomTraverser::OnElement(IHTMLElement* pEl, const CString& tag, CPlug inDomTraverserCache* cache, bool isDebug, CString& indent)
31 { 31 {
32 if (cache->m_isHidden) 32 if (cache->m_isHidden)
33 { 33 {
34 return false; 34 return false;
35 } 35 }
36 36
37 // Check if element is hidden 37 // Check if element is hidden
38 CPluginClient* client = CPluginClient::GetInstance(); 38 CPluginClient* client = CPluginClient::GetInstance();
39 39
40 cache->m_isHidden = client->IsElementHidden(to_wstring(tag), pEl, m_domain, to _wstring(indent), m_tab->m_filter.get()); 40 cache->m_isHidden = client->IsElementHidden(ToWstring(tag), pEl, m_domain, ToW string(indent), m_tab->m_filter.get());
41 if (cache->m_isHidden) 41 if (cache->m_isHidden)
42 { 42 {
43 HideElement(pEl, tag, L"", false, indent); 43 HideElement(pEl, tag, L"", false, indent);
44 return false; 44 return false;
45 } 45 }
46 46
47 // Images 47 // Images
48 if (tag == "img") 48 if (tag == "img")
49 { 49 {
50 CComVariant vAttr; 50 CComVariant vAttr;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 135
136 #ifdef ENABLE_DEBUG_RESULT 136 #ifdef ENABLE_DEBUG_RESULT
137 if (isDebug) 137 if (isDebug)
138 { 138 {
139 CPluginDebug::DebugResultHiding(type, ToCString(url), "-"); 139 CPluginDebug::DebugResultHiding(type, ToCString(url), "-");
140 } 140 }
141 #endif // ENABLE_DEBUG_RESULT 141 #endif // ENABLE_DEBUG_RESULT
142 } 142 }
143 } 143 }
144 } 144 }
OLDNEW
« no previous file with comments | « src/plugin/AdblockPlusClient.cpp ('k') | src/plugin/PluginClass.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld