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

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

Issue 6299667012780032: Issues #696,1231,1264,1265 - Improve handling in PassthroughApp (Closed)
Patch Set: Get rid of yoda style and rename blockedByABPPageSize local var Created Sept. 22, 2014, 4:14 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/PluginClass.cpp ('k') | src/plugin/PluginTabBase.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 "PluginFilter.h" 3 #include "PluginFilter.h"
4 4
5 #if (defined PRODUCT_ADBLOCKPLUS) 5 #if (defined PRODUCT_ADBLOCKPLUS)
6 #include "PluginSettings.h" 6 #include "PluginSettings.h"
7 #include "PluginClient.h" 7 #include "PluginClient.h"
8 #include "PluginClientFactory.h" 8 #include "PluginClientFactory.h"
9 #endif 9 #endif
10 10
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 417
418 418
419 // ============================================================================ 419 // ============================================================================
420 // CPluginFilter 420 // CPluginFilter
421 // ============================================================================ 421 // ============================================================================
422 422
423 CPluginFilter::CPluginFilter(const CString& dataPath) : m_dataPath(dataPath) 423 CPluginFilter::CPluginFilter(const CString& dataPath) : m_dataPath(dataPath)
424 { 424 {
425 m_contentMapText[CFilter::contentTypeDocument] = "DOCUMENT"; 425 m_contentMapText[CFilter::contentTypeDocument] = "DOCUMENT";
426 m_contentMapText[CFilter::contentTypeObject] = "OBJECT"; 426 m_contentMapText[CFilter::contentTypeObject] = "OBJECT";
427 m_contentMapText[CFilter::contentTypeObjectSubrequest] = "OBJECT-SUBREQUEST";
427 m_contentMapText[CFilter::contentTypeImage] = "IMAGE"; 428 m_contentMapText[CFilter::contentTypeImage] = "IMAGE";
428 m_contentMapText[CFilter::contentTypeScript] = "SCRIPT"; 429 m_contentMapText[CFilter::contentTypeScript] = "SCRIPT";
429 m_contentMapText[CFilter::contentTypeOther] = "OTHER"; 430 m_contentMapText[CFilter::contentTypeOther] = "OTHER";
430 m_contentMapText[CFilter::contentTypeUnknown] = "OTHER"; 431 m_contentMapText[CFilter::contentTypeUnknown] = "OTHER";
431 m_contentMapText[CFilter::contentTypeSubdocument] = "SUBDOCUMENT"; 432 m_contentMapText[CFilter::contentTypeSubdocument] = "SUBDOCUMENT";
432 m_contentMapText[CFilter::contentTypeStyleSheet] = "STYLESHEET"; 433 m_contentMapText[CFilter::contentTypeStyleSheet] = "STYLESHEET";
433 m_contentMapText[CFilter::contentTypeXmlHttpRequest] = "XMLHTTPREQUEST"; 434 m_contentMapText[CFilter::contentTypeXmlHttpRequest] = "XMLHTTPREQUEST";
434 435
435 ClearFilters(); 436 ClearFilters();
436 } 437 }
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 if (addDebug) 709 if (addDebug)
709 { 710 {
710 DEBUG_FILTER("Filter::ShouldBlock " + type + " YES") 711 DEBUG_FILTER("Filter::ShouldBlock " + type + " YES")
711 712
712 #ifdef ENABLE_DEBUG_RESULT 713 #ifdef ENABLE_DEBUG_RESULT
713 CPluginDebug::DebugResultBlocking(type, src, domain); 714 CPluginDebug::DebugResultBlocking(type, src, domain);
714 #endif 715 #endif
715 } 716 }
716 return true; 717 return true;
717 } 718 }
719 #ifdef ENABLE_DEBUG_RESULT
720 CPluginDebug::DebugResultIgnoring(type, src, domain);
721 #endif
718 return false; 722 return false;
719 } 723 }
OLDNEW
« no previous file with comments | « src/plugin/PluginClass.cpp ('k') | src/plugin/PluginTabBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld