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

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

Issue 5163396739629056: Issue #1234 - Remove CString from ShouldBlock(), IsElementHidden() declarations (Closed)
Patch Set: Created Aug. 7, 2014, 2:20 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
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)
11 { 11 {
12 } 12 }
13 13
14 14
15 bool CPluginDomTraverser::OnIFrame(IHTMLElement* pEl, const CString& url, CStrin g& indent) 15 bool CPluginDomTraverser::OnIFrame(IHTMLElement* pEl, const CString& url, CStrin g& indent)
16 { 16 {
17 CPluginClient* client = CPluginClient::GetInstance(); 17 CPluginClient* client = CPluginClient::GetInstance();
18 18
19 // If src should be blocked, set style display:none on iframe 19 // If src should be blocked, set style display:none on iframe
20 bool isBlocked = client->ShouldBlock(url, CFilter::contentTypeSubdocument, m_d omain); 20 bool isBlocked = client->ShouldBlock(to_wstring(url), CFilter::contentTypeSubd ocument, to_wstring(m_domain));
21 if (isBlocked) 21 if (isBlocked)
22 { 22 {
23 HideElement(pEl, "iframe", url, true, indent); 23 HideElement(pEl, "iframe", url, true, indent);
24 } 24 }
25 25
26 return !isBlocked; 26 return !isBlocked;
27 } 27 }
28 28
29 29
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(tag, pEl, m_domain, indent, m_tab- >m_filter.get()); 40 cache->m_isHidden = client->IsElementHidden(to_wstring(tag), pEl, to_wstring(m _domain), to_wstring(indent), m_tab->m_filter.get());
41 if (cache->m_isHidden) 41 if (cache->m_isHidden)
42 { 42 {
43 HideElement(pEl, tag, "", false, indent); 43 HideElement(pEl, tag, "", 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;
51 51
52 if (SUCCEEDED(pEl->getAttribute(L"src", 0, &vAttr)) && vAttr.vt == VT_BSTR & & ::SysStringLen(vAttr.bstrVal) > 0) 52 if (SUCCEEDED(pEl->getAttribute(L"src", 0, &vAttr)) && vAttr.vt == VT_BSTR & & ::SysStringLen(vAttr.bstrVal) > 0)
53 { 53 {
54 CString src = vAttr.bstrVal; 54 CString src = vAttr.bstrVal;
55 CPluginClient::UnescapeUrl(src); 55 CPluginClient::UnescapeUrl(src);
56 56
57 // If src should be blocked, set style display:none on image 57 // If src should be blocked, set style display:none on image
58 cache->m_isHidden = client->ShouldBlock(src, CFilter::contentTypeImage, m_ domain); 58 cache->m_isHidden = client->ShouldBlock(to_wstring(src), CFilter::contentT ypeImage, to_wstring(m_domain));
59 if (cache->m_isHidden) 59 if (cache->m_isHidden)
60 { 60 {
61 HideElement(pEl, "image", src, true, indent); 61 HideElement(pEl, "image", src, true, indent);
62 return false; 62 return false;
63 } 63 }
64 } 64 }
65 } 65 }
66 // Objects 66 // Objects
67 else if (tag == "object") 67 else if (tag == "object")
68 { 68 {
(...skipping 14 matching lines...) Expand all
83 src = sObjectHtml.Mid(posBegin, posEnd - posBegin); 83 src = sObjectHtml.Mid(posBegin, posEnd - posBegin);
84 84
85 // eg. http://w3schools.com/html/html_examples.asp 85 // eg. http://w3schools.com/html/html_examples.asp
86 if (src.Left(2) == "//") 86 if (src.Left(2) == "//")
87 { 87 {
88 src = "http:" + src; 88 src = "http:" + src;
89 } 89 }
90 90
91 if (!src.IsEmpty()) 91 if (!src.IsEmpty())
92 { 92 {
93 // cache->m_isHidden = client->ShouldBlock( src, CFilter::contentTypeObject, m_domain);
94 if (cache->m_isHidden) 93 if (cache->m_isHidden)
95 { 94 {
96 HideElement(pEl, "object", src, true, indent); 95 HideElement(pEl, "object", src, true, indent);
97 return false; 96 return false;
98 } 97 }
99 } 98 }
100 99
101 posBegin = sObjectHtml.Find(L"VALUE=\"", posBegin); 100 posBegin = sObjectHtml.Find(L"VALUE=\"", posBegin);
102 posEnd = posBegin >= 0 ? sObjectHtml.Find(L"\"", posBegin + 7) : -1; 101 posEnd = posBegin >= 0 ? sObjectHtml.Find(L"\"", posBegin + 7) : -1;
103 } 102 }
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 136
138 #ifdef ENABLE_DEBUG_RESULT 137 #ifdef ENABLE_DEBUG_RESULT
139 if (isDebug) 138 if (isDebug)
140 { 139 {
141 CPluginDebug::DebugResultHiding(type, url, "-"); 140 CPluginDebug::DebugResultHiding(type, url, "-");
142 } 141 }
143 #endif // ENABLE_DEBUG_RESULT 142 #endif // ENABLE_DEBUG_RESULT
144 } 143 }
145 } 144 }
146 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld