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

Unified Diff: src/plugin/PluginFilter.cpp

Issue 4895405913407488: Issue #1234 - remove CString from declarations representing domains. (Closed)
Patch Set: Created Aug. 7, 2014, 7:46 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/plugin/PluginDomTraverserBase.h ('k') | src/plugin/PluginTabBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/plugin/PluginFilter.cpp
===================================================================
--- a/src/plugin/PluginFilter.cpp
+++ b/src/plugin/PluginFilter.cpp
@@ -524,8 +524,6 @@
CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
{
- CString domainTest = to_CString(domain);
-
// Search tag/id filters
if (!id.IsEmpty())
{
@@ -681,10 +679,9 @@
}
}
-bool CPluginFilter::ShouldBlock(const std::wstring& src_wstring, int contentType, const std::wstring& domain_wstring, bool addDebug) const
+bool CPluginFilter::ShouldBlock(const std::wstring& src_wstring, int contentType, const std::wstring& domain, bool addDebug) const
{
CString src = to_CString(src_wstring);
- CString domain = to_CString(domain_wstring);
// We should not block the empty string, so all filtering does not make sense
// Therefore we just return
@@ -708,7 +705,7 @@
}
CPluginClient* client = CPluginClient::GetInstance();
- if (client->Matches(std::wstring(src), std::wstring(type), std::wstring(domain)))
+ if (client->Matches(std::wstring(src), std::wstring(type), domain))
{
if (addDebug)
{
« no previous file with comments | « src/plugin/PluginDomTraverserBase.h ('k') | src/plugin/PluginTabBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld