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: rebase Created Oct. 17, 2014, 12:51 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/AdblockPlusDomTraverser.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 #include "PluginSettings.h" 4 #include "PluginSettings.h"
5 #include "PluginClient.h" 5 #include "PluginClient.h"
6 #include "PluginClientFactory.h" 6 #include "PluginClientFactory.h"
7 #include "PluginMutex.h" 7 #include "PluginMutex.h"
8 #include "PluginSettings.h" 8 #include "PluginSettings.h"
9 #include "PluginSystem.h" 9 #include "PluginSystem.h"
10 #include "PluginClass.h" 10 #include "PluginClass.h"
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 413
414 414
415 // ============================================================================ 415 // ============================================================================
416 // CPluginFilter 416 // CPluginFilter
417 // ============================================================================ 417 // ============================================================================
418 418
419 CPluginFilter::CPluginFilter(const CString& dataPath) : m_dataPath(dataPath) 419 CPluginFilter::CPluginFilter(const CString& dataPath) : m_dataPath(dataPath)
420 { 420 {
421 m_contentMapText[CFilter::contentTypeDocument] = "DOCUMENT"; 421 m_contentMapText[CFilter::contentTypeDocument] = "DOCUMENT";
422 m_contentMapText[CFilter::contentTypeObject] = "OBJECT"; 422 m_contentMapText[CFilter::contentTypeObject] = "OBJECT";
423 m_contentMapText[CFilter::contentTypeObjectSubrequest] = "OBJECT-SUBREQUEST";
423 m_contentMapText[CFilter::contentTypeImage] = "IMAGE"; 424 m_contentMapText[CFilter::contentTypeImage] = "IMAGE";
424 m_contentMapText[CFilter::contentTypeScript] = "SCRIPT"; 425 m_contentMapText[CFilter::contentTypeScript] = "SCRIPT";
425 m_contentMapText[CFilter::contentTypeOther] = "OTHER"; 426 m_contentMapText[CFilter::contentTypeOther] = "OTHER";
426 m_contentMapText[CFilter::contentTypeUnknown] = "OTHER"; 427 m_contentMapText[CFilter::contentTypeUnknown] = "OTHER";
427 m_contentMapText[CFilter::contentTypeSubdocument] = "SUBDOCUMENT"; 428 m_contentMapText[CFilter::contentTypeSubdocument] = "SUBDOCUMENT";
428 m_contentMapText[CFilter::contentTypeStyleSheet] = "STYLESHEET"; 429 m_contentMapText[CFilter::contentTypeStyleSheet] = "STYLESHEET";
429 m_contentMapText[CFilter::contentTypeXmlHttpRequest] = "XMLHTTPREQUEST"; 430 m_contentMapText[CFilter::contentTypeXmlHttpRequest] = "XMLHTTPREQUEST";
430 431
431 ClearFilters(); 432 ClearFilters();
432 } 433 }
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 if (addDebug) 701 if (addDebug)
701 { 702 {
702 DEBUG_FILTER("Filter::ShouldBlock " + type + " YES") 703 DEBUG_FILTER("Filter::ShouldBlock " + type + " YES")
703 704
704 #ifdef ENABLE_DEBUG_RESULT 705 #ifdef ENABLE_DEBUG_RESULT
705 CPluginDebug::DebugResultBlocking(type, srcCString, domain); 706 CPluginDebug::DebugResultBlocking(type, srcCString, domain);
706 #endif 707 #endif
707 } 708 }
708 return true; 709 return true;
709 } 710 }
711 #ifdef ENABLE_DEBUG_RESULT
712 CPluginDebug::DebugResultIgnoring(type, src, domain);
713 #endif
710 return false; 714 return false;
711 } 715 }
OLDNEW
« no previous file with comments | « src/plugin/AdblockPlusDomTraverser.cpp ('k') | src/plugin/PluginTabBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld