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

Unified Diff: src/plugin/PluginWbPassThrough.cpp

Issue 5020125841326080: Issue 1669 - Report blocked object subrequests as failed, not as empty HTML (Closed)
Patch Set: Moved to WBPassthruSink::BeginningTransaction. Renamed the m_blockedInTransaction. Created Dec. 9, 2014, 10:16 a.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/PluginWbPassThrough.h ('k') | src/plugin/SinkPolicy.inl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/plugin/PluginWbPassThrough.cpp
===================================================================
--- a/src/plugin/PluginWbPassThrough.cpp
+++ b/src/plugin/PluginWbPassThrough.cpp
@@ -74,7 +74,7 @@
WBPassthruSink::WBPassthruSink()
: m_currentPositionOfSentPage(0)
, m_contentType(CFilter::EContentType::contentTypeAny)
- , m_blockedInTransaction(false)
+ , m_isCustomResponse(false)
{
}
@@ -330,9 +330,9 @@
m_contentType = CFilter::EContentType::contentTypeXmlHttpRequest;
}
- m_blockedInTransaction = client->ShouldBlock(szURL, m_contentType, m_boundDomain, /*debug flag but must be set*/true);
- if (m_blockedInTransaction)
+ if (client->ShouldBlock(szURL, m_contentType, m_boundDomain, /*debug flag but must be set*/true))
{
+ m_isCustomResponse = m_contentType != CFilter::contentTypeObjectSubrequest;
return E_ABORT;
}
return nativeHr;
@@ -358,7 +358,7 @@
STDMETHODIMP WBPassthruSink::ReportResult(/* [in] */ HRESULT hrResult, /* [in] */ DWORD dwError, /* [in] */ LPCWSTR szResult)
{
- if (m_blockedInTransaction)
+ if (m_isCustomResponse)
{
// Don't notify the client about aborting of the operation, thus don't call BaseClass::ReportResult.
// Current method is called by the original protocol implementation and we are intercepting the
« no previous file with comments | « src/plugin/PluginWbPassThrough.h ('k') | src/plugin/SinkPolicy.inl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld