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

Delta Between Two Patch Sets: src/plugin/SinkPolicy.inl

Issue 5020125841326080: Issue 1669 - Report blocked object subrequests as failed, not as empty HTML (Closed)
Left Patch Set: Created Dec. 7, 2014, 11:55 p.m.
Right Patch Set: Added comment Created Dec. 9, 2014, 10:27 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « src/plugin/PluginWbPassThrough.cpp ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 #ifndef PASSTHROUGHAPP_SINKPOLICY_INL 1 #ifndef PASSTHROUGHAPP_SINKPOLICY_INL
2 #define PASSTHROUGHAPP_SINKPOLICY_INL 2 #define PASSTHROUGHAPP_SINKPOLICY_INL
3 3
4 #if _MSC_VER > 1000 4 #if _MSC_VER > 1000
5 #pragma once 5 #pragma once
6 #endif // _MSC_VER > 1000 6 #endif // _MSC_VER > 1000
7 7
8 #ifndef PASSTHROUGHAPP_SINKPOLICY_H 8 #ifndef PASSTHROUGHAPP_SINKPOLICY_H
9 #error SinkPolicy.inl requires SinkPolicy.h to be included first 9 #error SinkPolicy.inl requires SinkPolicy.h to be included first
10 #endif 10 #endif
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 } 376 }
377 if (SUCCEEDED(hr)) 377 if (SUCCEEDED(hr))
378 { 378 {
379 hr = pSink->QueryInterface(IID_IInternetBindInfo, reinterpret_ca st<void**>(&spBindInfo)); 379 hr = pSink->QueryInterface(IID_IInternetBindInfo, reinterpret_ca st<void**>(&spBindInfo));
380 ATLASSERT(SUCCEEDED(hr) && spBindInfo != 0); 380 ATLASSERT(SUCCEEDED(hr) && spBindInfo != 0);
381 } 381 }
382 if (SUCCEEDED(hr) && !handled) 382 if (SUCCEEDED(hr) && !handled)
383 { 383 {
384 hr = pTargetProtocol->Start(szUrl, spSink, spBindInfo, grfPI, dw Reserved); 384 hr = pTargetProtocol->Start(szUrl, spSink, spBindInfo, grfPI, dw Reserved);
385 } 385 }
386 » if (E_ABORT == hr && pSink->m_blockedInTransaction) 386 » if (E_ABORT == hr && pSink->m_isCustomResponse)
387 { 387 {
388 static_cast<Protocol*>(this)->m_shouldSupplyCustomContent = true ; 388 static_cast<Protocol*>(this)->m_shouldSupplyCustomContent = true ;
389 pSink->m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMET YPEAVAILABLE, L"text/html"); 389 pSink->m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMET YPEAVAILABLE, L"text/html");
390 pSink->m_spInternetProtocolSink->ReportData(BSCF_FIRSTDATANOTIFI CATION, 0, static_cast<ULONG>(g_blockedByABPPage.size())); 390 pSink->m_spInternetProtocolSink->ReportData(BSCF_FIRSTDATANOTIFI CATION, 0, static_cast<ULONG>(g_blockedByABPPage.size()));
391 return S_OK; 391 return S_OK;
392 } 392 }
393 return hr; 393 return hr;
394 } 394 }
395 395
396 396
(...skipping 13 matching lines...) Expand all
410 template <class Protocol, class Sink> 410 template <class Protocol, class Sink>
411 inline Protocol* CustomSinkStartPolicy<Protocol, Sink>::GetProtocol( 411 inline Protocol* CustomSinkStartPolicy<Protocol, Sink>::GetProtocol(
412 const Sink* pSink) 412 const Sink* pSink)
413 { 413 {
414 return Protocol::ComObjectClass::GetProtocol(pSink); 414 return Protocol::ComObjectClass::GetProtocol(pSink);
415 } 415 }
416 416
417 } // end namespace PassthroughAPP 417 } // end namespace PassthroughAPP
418 418
419 #endif // PASSTHROUGHAPP_SINKPOLICY_INL 419 #endif // PASSTHROUGHAPP_SINKPOLICY_INL
LEFTRIGHT

Powered by Google App Engine
This is Rietveld