src/plugin/AdblockPlusDomTraverser.cpp - Issue 5163396739629056: Issue #1234 - Remove CString from ShouldBlock(), IsElementHidden() declarations

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified 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.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: src/plugin/AdblockPlusDomTraverser.cpp

===================================================================

--- a/src/plugin/AdblockPlusDomTraverser.cpp

+++ b/src/plugin/AdblockPlusDomTraverser.cpp

@@ -17,7 +17,7 @@

CPluginClient* client = CPluginClient::GetInstance();

// If src should be blocked, set style display:none on iframe

- bool isBlocked = client->ShouldBlock(url, CFilter::contentTypeSubdocument, m_domain);

+ bool isBlocked = client->ShouldBlock(to_wstring(url), CFilter::contentTypeSubdocument, to_wstring(m_domain));

if (isBlocked)

{

HideElement(pEl, "iframe", url, true, indent);

@@ -37,7 +37,7 @@

// Check if element is hidden

CPluginClient* client = CPluginClient::GetInstance();

- cache->m_isHidden = client->IsElementHidden(tag, pEl, m_domain, indent, m_tab->m_filter.get());

+ cache->m_isHidden = client->IsElementHidden(to_wstring(tag), pEl, to_wstring(m_domain), to_wstring(indent), m_tab->m_filter.get());

if (cache->m_isHidden)

{

HideElement(pEl, tag, "", false, indent);

@@ -55,7 +55,7 @@

CPluginClient::UnescapeUrl(src);

// If src should be blocked, set style display:none on image

- cache->m_isHidden = client->ShouldBlock(src, CFilter::contentTypeImage, m_domain);

+ cache->m_isHidden = client->ShouldBlock(to_wstring(src), CFilter::contentTypeImage, to_wstring(m_domain));

if (cache->m_isHidden)

{

HideElement(pEl, "image", src, true, indent);

@@ -90,7 +90,6 @@

if (!src.IsEmpty())

{

- // cache->m_isHidden = client->ShouldBlock(src, CFilter::contentTypeObject, m_domain);

if (cache->m_isHidden)

{

HideElement(pEl, "object", src, true, indent);